Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 30 Apr 2014 00:04:55 +0000 (02:04 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 30 Apr 2014 00:04:55 +0000 (02:04 +0200)

Trivial merge