Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 29 Nov 2012 17:14:43 +0000 (18:14 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 29 Nov 2012 17:14:43 +0000 (18:14 +0100)

Trivial merge