Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 11 Jan 2015 16:46:22 +0000 (17:46 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 11 Jan 2015 16:46:22 +0000 (17:46 +0100)

Trivial merge