Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 7 Jun 2014 13:41:12 +0000 (15:41 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 7 Jun 2014 13:41:12 +0000 (15:41 +0200)

Trivial merge