Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 26 Jun 2013 23:52:13 +0000 (01:52 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 26 Jun 2013 23:52:13 +0000 (01:52 +0200)

Trivial merge