Merge branch 'master' of github.com:rg3/youtube-dl
authorSergey M․ <dstftw@gmail.com>
Thu, 31 Dec 2015 20:22:26 +0000 (02:22 +0600)
committerSergey M․ <dstftw@gmail.com>
Thu, 31 Dec 2015 20:22:26 +0000 (02:22 +0600)

Trivial merge