Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 26 Nov 2014 09:45:57 +0000 (10:45 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 26 Nov 2014 09:45:57 +0000 (10:45 +0100)

Trivial merge