Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Feb 2015 14:59:14 +0000 (15:59 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Feb 2015 14:59:14 +0000 (15:59 +0100)

Trivial merge