From: Sergey M․ <dstftw@gmail.com>
Date: Sun, 28 Jun 2015 12:00:49 +0000 (+0600)
Subject: Merge branch 'moviefap' of https://github.com/gebn/youtube-dl into gebn-moviefap
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=c7c040b825160316d23b9d9f3b0f3ab9637d21c2;hp=-c;p=youtube-dl.git

Merge branch 'moviefap' of https://github.com/gebn/youtube-dl into gebn-moviefap
---

c7c040b825160316d23b9d9f3b0f3ab9637d21c2
diff --combined youtube_dl/extractor/__init__.py
index c0a825e8a,b70c1b57e..d41d277c9
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -311,6 -311,7 +311,7 @@@ from .morningstar import MorningstarI
  from .motherless import MotherlessIE
  from .motorsport import MotorsportIE
  from .movieclips import MovieClipsIE
+ from .moviefap import MovieFapIE
  from .moviezine import MoviezineIE
  from .movshare import MovShareIE
  from .mtv import (
@@@ -621,7 -622,6 +622,7 @@@ from .twitch import 
      TwitchBookmarksIE,
      TwitchStreamIE,
  )
 +from .twitter import TwitterCardIE
  from .ubu import UbuIE
  from .udemy import (
      UdemyIE,