Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 19 May 2014 15:10:19 +0000 (17:10 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 19 May 2014 15:10:19 +0000 (17:10 +0200)

Trivial merge