Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 2 Feb 2015 22:38:54 +0000 (23:38 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 2 Feb 2015 22:38:54 +0000 (23:38 +0100)

Trivial merge