Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 21 Sep 2013 09:10:30 +0000 (11:10 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 21 Sep 2013 09:10:30 +0000 (11:10 +0200)

Trivial merge