Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 11 Dec 2014 15:23:01 +0000 (16:23 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 11 Dec 2014 15:23:01 +0000 (16:23 +0100)

Trivial merge