Merge remote-tracking branch 'dstftw/channel9'

Conflicts:
	youtube_dl/extractor/__init__.py

diff --cc youtube_dl/extractor/__init__.py
index 41b6289a5f95cde7b1814107bd8bddd172c65c0b,fb206a74251c806d46e5cc4efaa87ecefab3d650..f01fa2cde53e7ae593e5677857c7b1b4fd098332
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -20,7 -20,7 +20,8 @@@ from .brightcove import BrightcoveI
  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