Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 13 Dec 2014 22:05:28 +0000 (23:05 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 13 Dec 2014 22:05:28 +0000 (23:05 +0100)

Trivial merge