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

Trivial merge