From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 5 Jan 2015 17:07:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'ckrooss/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=93e40a7b2f0020a3d1e9f5e5afe29f308dcb6b73;hp=-c

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

93e40a7b2f0020a3d1e9f5e5afe29f308dcb6b73
diff --combined youtube_dl/extractor/__init__.py
index 0c8729384,349f4fe71..8e47bd60d
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -164,6 -164,10 +164,6 @@@ from .globo import GloboI
  from .godtube import GodTubeIE
  from .goldenmoustache import GoldenMoustacheIE
  from .golem import GolemIE
 -from .gogoanime import (
 -    GoGoAnimeIE,
 -    GoGoAnimeSearchIE
 -)
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
  from .gorillavid import GorillaVidIE
@@@ -313,6 -317,16 +313,6 @@@ from .phoenix import PhoenixI
  from .photobucket import PhotobucketIE
  from .planetaplay import PlanetaPlayIE
  from .played import PlayedIE
 -from .play44 import (
 -    Play44IE,
 -    ByZooIE,
 -    Video44IE,
 -    VideoWingIE,
 -    PlayPandaIE,
 -    VideoZooIE,
 -    PlayBBIE,
 -    EasyVideoIE
 -)
  from .playfm import PlayFMIE
  from .playvid import PlayvidIE
  from .podomatic import PodomaticIE
@@@ -325,6 -339,7 +325,7 @@@ from .prosiebensat1 import ProSiebenSat
  from .pyvideo import PyvideoIE
  from .quickvid import QuickVidIE
  from .radiode import RadioDeIE
+ from .radiobremen import RadioBremenIE
  from .radiofrance import RadioFranceIE
  from .rai import RaiIE
  from .rbmaradio import RBMARadioIE
@@@ -374,6 -389,10 +375,6 @@@ from .smotri import 
  from .snotr import SnotrIE
  from .sockshare import SockshareIE
  from .sohu import SohuIE
 -from .soulanime import (
 -    SoulAnimeWatchingIE,
 -    SoulAnimeSeriesIE
 -)
  from .soundcloud import (
      SoundcloudIE,
      SoundcloudSetIE,
@@@ -468,6 -487,7 +469,6 @@@ from .viddler import ViddlerI
  from .videobam import VideoBamIE
  from .videodetective import VideoDetectiveIE
  from .videolecturesnet import VideoLecturesNetIE
 -from .videofun import VideoFunIE
  from .videofyme import VideofyMeIE
  from .videomega import VideoMegaIE
  from .videopremium import VideoPremiumIE
@@@ -511,7 -531,6 +512,7 @@@ from .wdr import 
      WDRMobileIE,
      WDRMausIE,
  )
 +from .webofstories import WebOfStoriesIE
  from .weibo import WeiboIE
  from .wimp import WimpIE
  from .wistia import WistiaIE
@@@ -547,6 -566,7 +548,6 @@@ from .youtube import 
      YoutubeSearchURLIE,
      YoutubeShowIE,
      YoutubeSubscriptionsIE,
 -    YoutubeTopListIE,
      YoutubeTruncatedIDIE,
      YoutubeTruncatedURLIE,
      YoutubeUserIE,