From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 27 Jan 2014 02:03:26 +0000 (-0800)
Subject: Merge pull request #2221 from Rudloff/master
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=0f2999fe2b352795d54e6fcc4027e6a64ce5bc1d;hp=-c;p=youtube-dl

Merge pull request #2221 from Rudloff/master

Removed websurg extractor
---

0f2999fe2b352795d54e6fcc4027e6a64ce5bc1d
diff --combined youtube_dl/extractor/__init__.py
index 05c782d58,90c6a8fdb..8daf995b9
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -72,7 -72,6 +72,7 @@@ from .francetv import 
      CultureboxIE,
  )
  from .freesound import FreesoundIE
 +from .freespeech import FreespeechIE
  from .funnyordie import FunnyOrDieIE
  from .gamekings import GamekingsIE
  from .gamespot import GameSpotIE
@@@ -219,7 -218,6 +219,6 @@@ from .vine import VineI
  from .viki import VikiIE
  from .vk import VKIE
  from .wat import WatIE
- from .websurg import WeBSurgIE
  from .weibo import WeiboIE
  from .wimp import WimpIE
  from .wistia import WistiaIE