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

Trivial merge