Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 8 Oct 2012 20:14:28 +0000 (22:14 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 8 Oct 2012 20:14:28 +0000 (22:14 +0200)

Trivial merge