Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 1 Oct 2012 16:38:19 +0000 (18:38 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 1 Oct 2012 16:38:19 +0000 (18:38 +0200)

Trivial merge