Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 15 Feb 2014 19:45:12 +0000 (20:45 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 15 Feb 2014 19:45:12 +0000 (20:45 +0100)

Trivial merge