Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 17 Jan 2014 13:48:15 +0000 (14:48 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 17 Jan 2014 13:48:15 +0000 (14:48 +0100)

Trivial merge