Merge remote-tracking branch 'dstftw/channel9'

Conflicts:
	youtube_dl/extractor/__init__.py
This commit is contained in:
Philipp Hagemeister 2013-12-16 05:14:00 +01:00
commit e4a0489f6e
2 changed files with 268 additions and 0 deletions

View file

@ -21,6 +21,7 @@ from .c56 import C56IE
from .canalplus import CanalplusIE
from .canalc2 import Canalc2IE
from .cbs import CBSIE
from .channel9 import Channel9IE
from .cinemassacre import CinemassacreIE
from .clipfish import ClipfishIE
from .clipsyndicate import ClipsyndicateIE