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

Trivial merge