Merge branch 'master' of github.com:rg3/youtube-dl into remitamine-ndr
authorSergey M․ <dstftw@gmail.com>
Sat, 12 Sep 2015 19:10:39 +0000 (01:10 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 12 Sep 2015 19:10:39 +0000 (01:10 +0600)

Trivial merge