From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 13 May 2014 08:11:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'hojel/empflix'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=feb72212091189353c0d6308fa20e4f33cc82da1;hp=-c

Merge remote-tracking branch 'hojel/empflix'
---

feb72212091189353c0d6308fa20e4f33cc82da1
diff --combined youtube_dl/extractor/__init__.py
index 3b10fc819,23b7cbd8f..3503c76b7
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -72,6 -72,7 +72,7 @@@ from .ehow import EHowI
  from .eighttracks import EightTracksIE
  from .eitb import EitbIE
  from .elpais import ElPaisIE
+ from .empflix import EmpflixIE
  from .engadget import EngadgetIE
  from .escapist import EscapistIE
  from .everyonesmixtape import EveryonesMixtapeIE
@@@ -79,7 -80,6 +80,7 @@@ from .exfm import ExfmI
  from .extremetube import ExtremeTubeIE
  from .facebook import FacebookIE
  from .faz import FazIE
 +from .fc2 import FC2IE
  from .firstpost import FirstpostIE
  from .firsttv import FirstTVIE
  from .fivemin import FiveMinIE
@@@ -110,7 -110,6 +111,7 @@@ from .googleplus import GooglePlusI
  from .googlesearch import GoogleSearchIE
  from .hark import HarkIE
  from .helsinki import HelsinkiIE
 +from .hentaistigma import HentaiStigmaIE
  from .hotnewhiphop import HotNewHipHopIE
  from .howcast import HowcastIE
  from .huffpost import HuffPostIE
@@@ -196,7 -195,6 +197,7 @@@ from .nowvideo import NowVideoI
  from .nrk import NRKIE
  from .ntv import NTVIE
  from .nytimes import NYTimesIE
 +from .nuvid import NuvidIE
  from .oe1 import OE1IE
  from .ooyala import OoyalaIE
  from .orf import ORFIE
@@@ -233,7 -231,6 +234,7 @@@ from .scivee import SciVeeI
  from .servingsys import ServingSysIE
  from .sina import SinaIE
  from .slideshare import SlideshareIE
 +from .slutload import SlutloadIE
  from .smotri import (
      SmotriIE,
      SmotriCommunityIE,
@@@ -299,7 -296,6 +300,7 @@@ from .videodetective import VideoDetect
  from .videolecturesnet import VideoLecturesNetIE
  from .videofyme import VideofyMeIE
  from .videopremium import VideoPremiumIE
 +from .videott import VideoTtIE
  from .videoweed import VideoWeedIE
  from .vimeo import (
      VimeoIE,
@@@ -310,10 -306,7 +311,10 @@@
      VimeoReviewIE,
      VimeoWatchLaterIE,
  )
 -from .vine import VineIE
 +from .vine import (
 +    VineIE,
 +    VineUserIE,
 +)
  from .viki import VikiIE
  from .vk import VKIE
  from .vube import VubeIE
@@@ -322,7 -315,6 +323,7 @@@ from .washingtonpost import WashingtonP
  from .wat import WatIE
  from .wdr import (
      WDRIE,
 +    WDRMobileIE,
      WDRMausIE,
  )
  from .weibo import WeiboIE