From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 21 Jul 2014 11:24:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'naglis/sockshare'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=7dabd2ac45a53bc608390a72c2d43044aaf6efb8;hp=-c;p=youtube-dl

Merge remote-tracking branch 'naglis/sockshare'

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

7dabd2ac45a53bc608390a72c2d43044aaf6efb8
diff --combined youtube_dl/extractor/__init__.py
index a4c7c713a,f3575b6c9..8d63d9281
--- 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
@@@ -53,7 -52,6 +53,7 @@@ from .cnn import 
  from .collegehumor import CollegeHumorIE
  from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
  from .condenast import CondeNastIE
 +from .cracked import CrackedIE
  from .criterion import CriterionIE
  from .crunchyroll import CrunchyrollIE
  from .cspan import CSpanIE
@@@ -64,7 -62,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 -170,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 -249,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,7 -262,7 +267,8 @@@ from .smotri import 
      SmotriUserIE,
      SmotriBroadcastIE,
  )
 +from .snotr import SnotrIE
+ from .sockshare import SockshareIE
  from .sohu import SohuIE
  from .soundcloud import (
      SoundcloudIE,
@@@ -402,7 -397,6 +403,7 @@@ from .youtube import 
      YoutubeUserIE,
      YoutubeWatchLaterIE,
  )
 +
  from .zdf import ZDFIE