From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 28 Sep 2014 08:10:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'd912e3/golem'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=92f7963f6e5dd9d6f2c8805f8ca51c70df15a776;hp=-c;p=youtube-dl

Merge remote-tracking branch 'd912e3/golem'
---

92f7963f6e5dd9d6f2c8805f8ca51c70df15a776
diff --combined youtube_dl/extractor/__init__.py
index 629280215,71fe38ca0..f815e6b91
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -135,6 -135,7 +135,7 @@@ from .gametrailers import GametrailersI
  from .gdcvault import GDCVaultIE
  from .generic import GenericIE
  from .godtube import GodTubeIE
+ from .golem import GolemIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
  from .gorillavid import GorillaVidIE
@@@ -261,7 -262,6 +262,7 @@@ from .nrk import 
  from .ntv import NTVIE
  from .nytimes import NYTimesIE
  from .nuvid import NuvidIE
 +from .oktoberfesttv import OktoberfestTVIE
  from .ooyala import OoyalaIE
  from .orf import (
      ORFTVthekIE,
@@@ -340,7 -340,6 +341,7 @@@ from .spankwire import SpankwireI
  from .spiegel import SpiegelIE, SpiegelArticleIE
  from .spiegeltv import SpiegeltvIE
  from .spike import SpikeIE
 +from .sport5 import Sport5IE
  from .sportdeutschland import SportDeutschlandIE
  from .stanfordoc import StanfordOpenClassroomIE
  from .steam import SteamIE
@@@ -452,7 -451,6 +453,7 @@@ from .yahoo import 
      YahooNewsIE,
      YahooSearchIE,
  )
 +from .ynet import YnetIE
  from .youjizz import YouJizzIE
  from .youku import YoukuIE
  from .youporn import YouPornIE