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

Trivial merge