Merge branch 'master' of https://github.com/pishposhmcgee/youtube-dl into pishposhmcg...
authorSergey M․ <dstftw@gmail.com>
Wed, 11 Mar 2015 15:45:43 +0000 (21:45 +0600)
committerSergey M․ <dstftw@gmail.com>
Wed, 11 Mar 2015 15:45:43 +0000 (21:45 +0600)

Trivial merge