Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 1 Mar 2015 11:05:13 +0000 (12:05 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 1 Mar 2015 11:05:13 +0000 (12:05 +0100)

Trivial merge