Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Aug 2013 00:00:23 +0000 (02:00 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Aug 2013 00:00:23 +0000 (02:00 +0200)

Trivial merge