Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Dec 2013 17:29:12 +0000 (18:29 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Dec 2013 17:29:12 +0000 (18:29 +0100)

Trivial merge