Merge branch 'master' of github.com:rg3/youtube-dl
authorSergey M․ <dstftw@gmail.com>
Thu, 19 Mar 2015 15:27:38 +0000 (21:27 +0600)
committerSergey M․ <dstftw@gmail.com>
Thu, 19 Mar 2015 15:27:38 +0000 (21:27 +0600)

Trivial merge