Merge branch 'master' of github.com:rg3/youtube-dl
authorSergey M․ <dstftw@gmail.com>
Mon, 13 Feb 2017 15:58:50 +0000 (22:58 +0700)
committerSergey M․ <dstftw@gmail.com>
Mon, 13 Feb 2017 15:58:50 +0000 (22:58 +0700)

Trivial merge