Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 8 Dec 2011 19:39:22 +0000 (20:39 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 8 Dec 2011 19:39:22 +0000 (20:39 +0100)

Trivial merge