Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 8 Feb 2014 17:37:53 +0000 (18:37 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 8 Feb 2014 17:37:53 +0000 (18:37 +0100)

Trivial merge