Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 15 Oct 2013 10:05:24 +0000 (12:05 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 15 Oct 2013 10:05:24 +0000 (12:05 +0200)

Trivial merge