Merge remote-tracking branch 'dstftw/channel9'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 16 Dec 2013 04:14:00 +0000 (05:14 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 16 Dec 2013 04:14:00 +0000 (05:14 +0100)
commite4a0489f6ebbbd26ca69caa42aa7ebdeb4fb3ce1
tree640e9d54de5d07de6e6b59a8bbcd12defafbbe0f
parentb83be81d27e252eed4585fcce14205266b51b1d5
parent9b17ba0fa512a9882a22bb2407ec433038bc8327
Merge remote-tracking branch 'dstftw/channel9'

Conflicts:
youtube_dl/extractor/__init__.py
youtube_dl/extractor/__init__.py