From: Sergey M․ <dstftw@gmail.com>
Date: Thu, 28 May 2015 16:22:29 +0000 (+0600)
Subject: Merge branch 'soompi' of https://github.com/ping/youtube-dl into ping-soompi
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=e26be70bca683696f9cc035b87161dd8fda29a5c;p=youtube-dl

Merge branch 'soompi' of https://github.com/ping/youtube-dl into ping-soompi
---

e26be70bca683696f9cc035b87161dd8fda29a5c
diff --cc youtube_dl/extractor/__init__.py
index 3c1e8d526,2a5cf9547..f73bf646b
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -479,7 -480,12 +479,11 @@@ from .smotri import 
      SmotriBroadcastIE,
  )
  from .snotr import SnotrIE
 -from .sockshare import SockshareIE
  from .sohu import SohuIE
+ from .soompi import (
+     SoompiIE,
+     SoompiShowIE,
+ )
  from .soundcloud import (
      SoundcloudIE,
      SoundcloudSetIE,