From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 28 Feb 2014 11:52:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'mnem/gdc-vault'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=aba3231de18dbb8cdfcc653cbba137844637e65e;hp=-c;p=youtube-dl

Merge remote-tracking branch 'mnem/gdc-vault'
---

aba3231de18dbb8cdfcc653cbba137844637e65e
diff --combined youtube_dl/extractor/__init__.py
index 8549a1a1e,60aa97636..2f8fcb8c9
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -89,6 -89,7 +89,7 @@@ from .funnyordie import FunnyOrDieI
  from .gamekings import GamekingsIE
  from .gamespot import GameSpotIE
  from .gametrailers import GametrailersIE
+ from .gdcvault import GDCVaultIE
  from .generic import GenericIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
@@@ -175,7 -176,6 +176,7 @@@ from .podomatic import PodomaticI
  from .pornhd import PornHdIE
  from .pornhub import PornHubIE
  from .pornotube import PornotubeIE
 +from .prosiebensat1 import ProSiebenSat1IE
  from .pyvideo import PyvideoIE
  from .radiofrance import RadioFranceIE
  from .rbmaradio import RBMARadioIE