From: Sergey M․ <dstftw@gmail.com>
Date: Sun, 31 Aug 2014 17:45:51 +0000 (+0700)
Subject: Merge branch 'sunporno' of https://github.com/peugeot/youtube-dl into peugeot-sunporno
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=43fd39241367f1a15475bd06073de6ebc0b8fd03;hp=-c;p=youtube-dl

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

43fd39241367f1a15475bd06073de6ebc0b8fd03
diff --combined youtube_dl/extractor/__init__.py
index a306035f1,72b01505d..459899861
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -4,7 -4,6 +4,7 @@@ from .addanime import AddAnimeI
  from .adultswim import AdultSwimIE
  from .aftonbladet import AftonbladetIE
  from .anitube import AnitubeIE
 +from .anysex import AnySexIE
  from .aol import AolIE
  from .allocine import AllocineIE
  from .aparat import AparatIE
@@@ -323,6 -322,7 +323,7 @@@ from .stanfordoc import StanfordOpenCla
  from .steam import SteamIE
  from .streamcloud import StreamcloudIE
  from .streamcz import StreamCZIE
+ from .sunporno import SunPornoIE
  from .swrmediathek import SWRMediathekIE
  from .syfy import SyfyIE
  from .sztvhu import SztvHuIE
@@@ -394,7 -394,6 +395,7 @@@ from .vine import 
  from .viki import VikiIE
  from .vk import VKIE
  from .vodlocker import VodlockerIE
 +from .vporn import VpornIE
  from .vube import VubeIE
  from .vuclip import VuClipIE
  from .vulture import VultureIE