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

Trivial merge