From: Sergey M․ <dstftw@gmail.com>
Date: Mon, 29 Dec 2014 14:38:28 +0000 (+0600)
Subject: Merge branch 'xxxymovies' of https://github.com/peugeot/youtube-dl into peugeot-xxxym... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=00de9a9828bd3ab409cc1e92a2316a69fe37ae66;hp=-c;p=youtube-dl

Merge branch 'xxxymovies' of https://github.com/peugeot/youtube-dl into peugeot-xxxymovies
---

00de9a9828bd3ab409cc1e92a2316a69fe37ae66
diff --combined youtube_dl/extractor/__init__.py
index ab0f76862,c8a77616e..c79e5b7d0
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -7,7 -7,6 +7,7 @@@ from .adobetv import AdobeTVI
  from .adultswim import AdultSwimIE
  from .aftonbladet import AftonbladetIE
  from .aljazeera import AlJazeeraIE
 +from .alphaporno import AlphaPornoIE
  from .anitube import AnitubeIE
  from .anysex import AnySexIE
  from .aol import AolIE
@@@ -65,7 -64,6 +65,7 @@@ from .cnet import CNETI
  from .cnn import (
      CNNIE,
      CNNBlogsIE,
 +    CNNArticleIE,
  )
  from .collegehumor import CollegeHumorIE
  from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
@@@ -110,7 -108,6 +110,7 @@@ from .elpais import ElPaisI
  from .empflix import EMPFlixIE
  from .engadget import EngadgetIE
  from .eporner import EpornerIE
 +from .eroprofile import EroProfileIE
  from .escapist import EscapistIE
  from .everyonesmixtape import EveryonesMixtapeIE
  from .exfm import ExfmIE
@@@ -515,6 -512,7 +515,7 @@@ from .xminus import XMinusI
  from .xnxx import XNXXIE
  from .xvideos import XVideosIE
  from .xtube import XTubeUserIE, XTubeIE
+ from .xxxymovies import XXXYMoviesIE
  from .yahoo import (
      YahooIE,
      YahooSearchIE,