From: Sergey M․ <dstftw@gmail.com>
Date: Wed, 20 May 2015 16:10:06 +0000 (+0600)
Subject: Merge branch 'ping-viki-shows'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=ca57a598838f7d945a09a1df569e1c29fdd0732b;hp=-c

Merge branch 'ping-viki-shows'
---

ca57a598838f7d945a09a1df569e1c29fdd0732b
diff --combined youtube_dl/extractor/__init__.py
index 6f8c261d5,173e9a155..24efb7ce5
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -572,10 -572,6 +572,10 @@@ from .tumblr import TumblrI
  from .tunein import TuneInIE
  from .turbo import TurboIE
  from .tutv import TutvIE
 +from .tv2 import (
 +    TV2IE,
 +    TV2ArticleIE,
 +)
  from .tv4 import TV4IE
  from .tvigle import TvigleIE
  from .tvp import TvpIE, TvpSeriesIE
@@@ -647,7 -643,10 +647,10 @@@ from .vine import 
      VineIE,
      VineUserIE,
  )
- from .viki import VikiIE
+ from .viki import (
+     VikiIE,
+     VikiChannelIE,
+ )
  from .vk import (
      VKIE,
      VKUserVideosIE,