Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Sep 2012 17:56:29 +0000 (19:56 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Sep 2012 17:56:29 +0000 (19:56 +0200)

Trivial merge