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

Trivial merge