From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Thu, 22 Aug 2013 10:24:27 +0000 (+0200)
Subject: Merge pull request #1267 from Rudloff/master
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=8403612258afb1897b82bd789cfb64ea76017688;hp=-c;p=youtube-dl

Merge pull request #1267 from Rudloff/master

Download videos from jeuxvideo.com

Edited to keep the file 'youtube-dl' unchanged.
---

8403612258afb1897b82bd789cfb64ea76017688
diff --combined youtube_dl/extractor/__init__.py
index a3e572923,b9bd3a429..9d12608e1
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -36,6 -36,7 +36,7 @@@ from .ign import IGNIE, OneUPI
  from .ina import InaIE
  from .infoq import InfoQIE
  from .instagram import InstagramIE
+ from .jeuxvideo import JeuxVideoIE
  from .jukebox import JukeboxIE
  from .justintv import JustinTVIE
  from .kankan import KankanIE
@@@ -50,16 -51,13 +51,16 @@@ from .myspass import MySpassI
  from .myvideo import MyVideoIE
  from .nba import NBAIE
  from .ooyala import OoyalaIE
 +from .pbs import PBSIE
  from .photobucket import PhotobucketIE
  from .pornotube import PornotubeIE
  from .rbmaradio import RBMARadioIE
  from .redtube import RedTubeIE
  from .ringtv import RingTVIE
  from .roxwel import RoxwelIE
 +from .rtlnow import RTLnowIE
  from .sina import SinaIE
 +from .slashdot import SlashdotIE
  from .soundcloud import SoundcloudIE, SoundcloudSetIE
  from .spiegel import SpiegelIE
  from .stanfordoc import StanfordOpenClassroomIE