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

Trivial merge