Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 21 Apr 2014 00:34:44 +0000 (02:34 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 21 Apr 2014 00:34:44 +0000 (02:34 +0200)

Trivial merge