Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 12 Apr 2014 15:15:16 +0000 (17:15 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 12 Apr 2014 15:15:16 +0000 (17:15 +0200)

Trivial merge