Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 6 Jul 2014 18:57:05 +0000 (20:57 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 6 Jul 2014 18:57:05 +0000 (20:57 +0200)

Trivial merge