Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 7 Sep 2013 20:28:54 +0000 (22:28 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 7 Sep 2013 20:28:54 +0000 (22:28 +0200)

Trivial merge