Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 31 Aug 2014 21:44:06 +0000 (23:44 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 31 Aug 2014 21:44:06 +0000 (23:44 +0200)

Trivial merge