Merge remote-tracking branch 'd912e3/heise'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 28 Sep 2014 08:36:44 +0000 (10:36 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 28 Sep 2014 08:36:44 +0000 (10:36 +0200)
commit0217aee154e9f0f5f0c82c3253046c925d4073eb
tree0c6997dd75cade71c05e586b9adcea05b8456eaf
parentb14f3a4c1da00cbee8775904c24c4d0547018ae0
parent7b7518124ee433484b485502671e011017bc1897
Merge remote-tracking branch 'd912e3/heise'
youtube_dl/extractor/__init__.py