From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 13 Nov 2014 14:53:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'yaccz/add-extractor/freevideo'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=11b28e93d3a5496916e55a717c362fe7a6a1c7e7;hp=-c;p=youtube-dl

Merge remote-tracking branch 'yaccz/add-extractor/freevideo'
---

11b28e93d3a5496916e55a717c362fe7a6a1c7e7
diff --combined youtube_dl/extractor/__init__.py
index c15b1add8,db76e8870..f45ce05ab
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -127,6 -127,7 +127,7 @@@ from .francetv import 
  )
  from .freesound import FreesoundIE
  from .freespeech import FreespeechIE
+ from .freevideo import FreeVideoIE
  from .funnyordie import FunnyOrDieIE
  from .gamekings import GamekingsIE
  from .gameone import (
@@@ -141,7 -142,6 +142,7 @@@ from .generic import GenericI
  from .glide import GlideIE
  from .globo import GloboIE
  from .godtube import GodTubeIE
 +from .goldenmoustache import GoldenMoustacheIE
  from .golem import GolemIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
@@@ -324,7 -324,6 +325,7 @@@ from .sbs import SBSI
  from .scivee import SciVeeIE
  from .screencast import ScreencastIE
  from .servingsys import ServingSysIE
 +from .sexu import SexuIE
  from .sexykarma import SexyKarmaIE
  from .shared import SharedIE
  from .sharesix import ShareSixIE