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

Trivial merge