Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 25 Jan 2015 20:39:50 +0000 (21:39 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 25 Jan 2015 20:39:50 +0000 (21:39 +0100)

Trivial merge