Merge branch 'master' of github.com:rg3/youtube-dl
authorSergey M․ <dstftw@gmail.com>
Sat, 10 Sep 2016 12:21:03 +0000 (19:21 +0700)
committerSergey M․ <dstftw@gmail.com>
Sat, 10 Sep 2016 12:21:03 +0000 (19:21 +0700)

Trivial merge