Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 28 Nov 2012 11:59:55 +0000 (12:59 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 28 Nov 2012 11:59:55 +0000 (12:59 +0100)

Trivial merge