From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Mon, 27 Jan 2014 11:21:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'sahutd/master'
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=96d7b8873ad47c1f52193e84fc6f8cfe12891aa7;hp=-c;p=youtube-dl.git

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

96d7b8873ad47c1f52193e84fc6f8cfe12891aa7
diff --combined youtube_dl/extractor/__init__.py
index cc992a64d,ba3d4ac0e..192baa9b8
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -47,6 -47,7 +47,7 @@@ from .depositfiles import DepositFilesI
  from .dotsub import DotsubIE
  from .dreisat import DreiSatIE
  from .defense import DefenseGouvFrIE
+ from .discovery import DiscoveryIE
  from .dropbox import DropboxIE
  from .ebaumsworld import EbaumsWorldIE
  from .ehow import EHowIE
@@@ -83,7 -84,6 +84,7 @@@ from .googlesearch import GoogleSearchI
  from .hark import HarkIE
  from .hotnewhiphop import HotNewHipHopIE
  from .howcast import HowcastIE
 +from .huffpost import HuffPostIE
  from .hypem import HypemIE
  from .ign import IGNIE, OneUPIE
  from .imdb import (
@@@ -107,7 -107,6 +108,7 @@@ from .keezmovies import KeezMoviesI
  from .khanacademy import KhanAcademyIE
  from .kickstarter import KickStarterIE
  from .keek import KeekIE
 +from .la7 import LA7IE
  from .liveleak import LiveLeakIE
  from .livestream import LivestreamIE, LivestreamOriginalIE
  from .lynda import (
@@@ -115,7 -114,6 +116,7 @@@
      LyndaCourseIE
  )
  from .macgamestore import MacGameStoreIE
 +from .malemotion import MalemotionIE
  from .mdr import MDRIE
  from .metacafe import MetacafeIE
  from .metacritic import MetacriticIE
@@@ -222,6 -220,7 +223,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