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

Trivial merge