Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 25 Oct 2014 07:55:05 +0000 (09:55 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 25 Oct 2014 07:55:05 +0000 (09:55 +0200)

Trivial merge