Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 27 Sep 2013 11:09:58 +0000 (13:09 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 27 Sep 2013 11:09:58 +0000 (13:09 +0200)

Trivial merge