Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Nov 2012 22:23:37 +0000 (23:23 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Nov 2012 22:23:37 +0000 (23:23 +0100)

Trivial merge