Merge branch 'master' of github.com:rg3/youtube-dl
authorSergey M․ <dstftw@gmail.com>
Wed, 1 Apr 2015 14:25:11 +0000 (20:25 +0600)
committerSergey M․ <dstftw@gmail.com>
Wed, 1 Apr 2015 14:25:11 +0000 (20:25 +0600)

Trivial merge