Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 3 Jul 2013 14:36:42 +0000 (16:36 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 3 Jul 2013 14:36:42 +0000 (16:36 +0200)

Trivial merge