Merge branch 'master' of github.com:rg3/youtube-dl
authorSergey M․ <dstftw@gmail.com>
Fri, 10 Jul 2015 14:56:08 +0000 (20:56 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 10 Jul 2015 14:56:08 +0000 (20:56 +0600)

Trivial merge