Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 22 Apr 2013 21:15:15 +0000 (23:15 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 22 Apr 2013 21:15:15 +0000 (23:15 +0200)

Trivial merge