From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Wed, 22 Jul 2015 12:10:45 +0000 (+0800)
Subject: Merge branch 'lecture2go' of https://github.com/nichdu/youtube-dl into nichdu-lecture2go
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=3f724339dbe61fe84dd8e66e9c3b74ba6a9c6ddf;p=youtube-dl

Merge branch 'lecture2go' of https://github.com/nichdu/youtube-dl into nichdu-lecture2go
---

3f724339dbe61fe84dd8e66e9c3b74ba6a9c6ddf
diff --cc youtube_dl/extractor/__init__.py
index 50da08830,3d6e981b2..3cfa804ec
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -265,16 -247,9 +265,17 @@@ from .keek import KeekI
  from .kontrtube import KontrTubeIE
  from .krasview import KrasViewIE
  from .ku6 import Ku6IE
 +from .kuwo import (
 +    KuwoIE,
 +    KuwoAlbumIE,
 +    KuwoChartIE,
 +    KuwoSingerIE,
 +    KuwoCategoryIE,
 +    KuwoMvIE,
 +)
  from .la7 import LA7IE
  from .laola1tv import Laola1TvIE
+ from .lecture2go import Lecture2GoIE
  from .letv import (
      LetvIE,
      LetvTvIE,