From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 16 Dec 2013 04:07:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'mjorlitzky/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=1bb2fc98e05b7cc556aa63aa226b5349e8a39159;hp=-c;p=youtube-dl

Merge remote-tracking branch 'mjorlitzky/master'
---

1bb2fc98e05b7cc556aa63aa226b5349e8a39159
diff --combined youtube_dl/extractor/__init__.py
index 37bf8e306,bd16f0f3e..41b6289a5
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -20,7 -20,6 +20,7 @@@ from .brightcove import BrightcoveI
  from .c56 import C56IE
  from .canalplus import CanalplusIE
  from .canalc2 import Canalc2IE
 +from .cbs import CBSIE
  from .cinemassacre import CinemassacreIE
  from .clipfish import ClipfishIE
  from .clipsyndicate import ClipsyndicateIE
@@@ -112,6 -111,7 +112,7 @@@ from .orf import ORFI
  from .pbs import PBSIE
  from .photobucket import PhotobucketIE
  from .podomatic import PodomaticIE
+ from .pornhd import PornHdIE
  from .pornhub import PornHubIE
  from .pornotube import PornotubeIE
  from .pyvideo import PyvideoIE