Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 29 Jun 2013 14:57:34 +0000 (16:57 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 29 Jun 2013 14:57:34 +0000 (16:57 +0200)

Trivial merge