From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 21 Jul 2014 09:43:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'hassaanaliw/snotr'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=199ece7eb83ffe7ba069b50080fe971df1db2d6c;hp=-c;p=youtube-dl

Merge remote-tracking branch 'hassaanaliw/snotr'
---

199ece7eb83ffe7ba069b50080fe971df1db2d6c
diff --combined youtube_dl/extractor/__init__.py
index a17a80a5f,faf473548..a4c7c713a
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -1,6 -1,5 +1,6 @@@
  from .academicearth import AcademicEarthCourseIE
  from .addanime import AddAnimeIE
 +from .adultswim import AdultSwimIE
  from .aftonbladet import AftonbladetIE
  from .anitube import AnitubeIE
  from .aol import AolIE
@@@ -64,7 -63,6 +64,7 @@@ from .dailymotion import 
      DailymotionUserIE,
  )
  from .daum import DaumIE
 +from .dfb import DFBIE
  from .dotsub import DotsubIE
  from .dreisat import DreiSatIE
  from .drtv import DRTVIE
@@@ -173,7 -171,6 +173,7 @@@ from .metacafe import MetacafeI
  from .metacritic import MetacriticIE
  from .mit import TechTVMITIE, MITIE, OCWMITIE
  from .mixcloud import MixcloudIE
 +from .mlb import MLBIE
  from .mpora import MporaIE
  from .mofosex import MofosexIE
  from .mooshare import MooshareIE
@@@ -253,7 -250,6 +253,7 @@@ from .rutube import 
      RutubePersonIE,
  )
  from .rutv import RUTVIE
 +from .sapo import SapoIE
  from .savefrom import SaveFromIE
  from .scivee import SciVeeIE
  from .screencast import ScreencastIE
@@@ -267,6 -263,7 +267,7 @@@ from .smotri import 
      SmotriUserIE,
      SmotriBroadcastIE,
  )
+ from .snotr import SnotrIE
  from .sohu import SohuIE
  from .soundcloud import (
      SoundcloudIE,