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

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

948bcc60df48415ddbf3d7ea03bc3af53a9d928d
diff --combined youtube_dl/extractor/__init__.py
index dde593003,697bcab87..5095f14b6
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -79,7 -79,6 +79,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
@@@ -231,6 -230,7 +231,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,
@@@ -296,7 -296,6 +297,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,
@@@ -307,10 -306,7 +308,10 @@@
      VimeoReviewIE,
      VimeoWatchLaterIE,
  )
 -from .vine import VineIE
 +from .vine import (
 +    VineIE,
 +    VineUserIE,
 +)
  from .viki import VikiIE
  from .vk import VKIE
  from .vube import VubeIE
@@@ -319,7 -315,6 +320,7 @@@ from .washingtonpost import WashingtonP
  from .wat import WatIE
  from .wdr import (
      WDRIE,
 +    WDRMobileIE,
      WDRMausIE,
  )
  from .weibo import WeiboIE