Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 28 Aug 2013 09:57:18 +0000 (11:57 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 28 Aug 2013 09:57:18 +0000 (11:57 +0200)

Trivial merge