From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 16 Dec 2013 04:14:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'dstftw/channel9'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=e4a0489f6ebbbd26ca69caa42aa7ebdeb4fb3ce1;p=youtube-dl

Merge remote-tracking branch 'dstftw/channel9'

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

e4a0489f6ebbbd26ca69caa42aa7ebdeb4fb3ce1
diff --cc youtube_dl/extractor/__init__.py
index 41b6289a5,fb206a742..f01fa2cde
--- a/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