Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 4 Jan 2015 01:08:38 +0000 (02:08 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 4 Jan 2015 01:08:38 +0000 (02:08 +0100)

Trivial merge