From: Sergey M․ <dstftw@gmail.com>
Date: Sat, 4 Apr 2015 10:59:39 +0000 (+0600)
Subject: Merge branch 'gamersyde' of https://github.com/snipem/youtube-dl into snipem-gamersyde
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=ae0dd4b2988efc6252121ca2824ca8b3a8a18fba;hp=-c;p=youtube-dl

Merge branch 'gamersyde' of https://github.com/snipem/youtube-dl into snipem-gamersyde
---

ae0dd4b2988efc6252121ca2824ca8b3a8a18fba
diff --combined youtube_dl/extractor/__init__.py
index d7e8138be,2935d5b33..c05a43641
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -177,6 -177,7 +177,7 @@@ from .gameone import 
      GameOneIE,
      GameOnePlaylistIE,
  )
+ from .gamersyde import GamersydeIE
  from .gamespot import GameSpotIE
  from .gamestar import GameStarIE
  from .gametrailers import GametrailersIE
@@@ -396,7 -397,6 +397,7 @@@ from .pyvideo import PyvideoI
  from .quickvid import QuickVidIE
  from .r7 import R7IE
  from .radiode import RadioDeIE
 +from .radiojavan import RadioJavanIE
  from .radiobremen import RadioBremenIE
  from .radiofrance import RadioFranceIE
  from .rai import RaiIE