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

Trivial merge