Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 25 Nov 2013 21:16:07 +0000 (22:16 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 25 Nov 2013 21:16:07 +0000 (22:16 +0100)

Trivial merge