Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 5 Apr 2014 18:05:47 +0000 (20:05 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 5 Apr 2014 18:05:47 +0000 (20:05 +0200)

Trivial merge