Merge remote-tracking branch 'Rudloff/canalc2'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Aug 2013 08:31:46 +0000 (10:31 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Aug 2013 08:31:46 +0000 (10:31 +0200)
commitaa5a63a5b54fe26654eb91005025d91237b39c64
tree33eb1b327dc567a0620e679b8cb100f9f688bb1f
parent2a7b4da9b2ee11e88976e0e93796fd8460aa053d
parentff2424595adf02cbe5d1f1071e53c3b2e5f32c9e
Merge remote-tracking branch 'Rudloff/canalc2'
youtube_dl/extractor/__init__.py