From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Fri, 4 Mar 2016 06:21:23 +0000 (+0800)
Subject: Merge branch 'kusi' of https://github.com/mutantmonkey/youtube-dl into mutantmonkey... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=8477a6928314cff7957fde55e56a05b2acf76871;hp=-c

Merge branch 'kusi' of https://github.com/mutantmonkey/youtube-dl into mutantmonkey-kusi
---

8477a6928314cff7957fde55e56a05b2acf76871
diff --combined youtube_dl/extractor/__init__.py
index 037654a23,bfc2008be..08b3dc673
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -45,7 -45,6 +45,7 @@@ from .arte import 
      ArteTVFutureIE,
      ArteTVCinemaIE,
      ArteTVDDCIE,
 +    ArteTVMagazineIE,
      ArteTVEmbedIE,
  )
  from .atresplayer import AtresPlayerIE
@@@ -74,7 -73,6 +74,7 @@@ from .bleacherreport import 
  )
  from .blinkx import BlinkxIE
  from .bloomberg import BloombergIE
 +from .bokecc import BokeCCIE
  from .bpb import BpbIE
  from .br import BRIE
  from .breakcom import BreakIE
@@@ -340,6 -338,7 +340,7 @@@ from .konserthusetplay import Konserthu
  from .kontrtube import KontrTubeIE
  from .krasview import KrasViewIE
  from .ku6 import Ku6IE
+ from .kusi import KUSIIE
  from .kuwo import (
      KuwoIE,
      KuwoAlbumIE,
@@@ -352,9 -351,10 +353,9 @@@ from .la7 import LA7I
  from .laola1tv import Laola1TvIE
  from .lecture2go import Lecture2GoIE
  from .lemonde import LemondeIE
 -from .letv import (
 -    LetvIE,
 -    LetvTvIE,
 -    LetvPlaylistIE,
 +from .leeco import (
 +    LeIE,
 +    LePlaylistIE,
      LetvCloudIE,
  )
  from .libsyn import LibsynIE
@@@ -505,7 -505,6 +506,7 @@@ from .npr import NprI
  from .nrk import (
      NRKIE,
      NRKPlaylistIE,
 +    NRKSkoleIE,
      NRKTVIE,
  )
  from .ntvde import NTVDeIE
@@@ -556,7 -555,6 +557,7 @@@ from .pornhd import PornHdI
  from .pornhub import (
      PornHubIE,
      PornHubPlaylistIE,
 +    PornHubUserVideosIE,
  )
  from .pornotube import PornotubeIE
  from .pornovoisines import PornoVoisinesIE
@@@ -670,6 -668,7 +671,6 @@@ from .southpark import 
      SouthParkEsIE,
      SouthParkNlIE
  )
 -from .space import SpaceIE
  from .spankbang import SpankBangIE
  from .spankwire import SpankwireIE
  from .spiegel import SpiegelIE, SpiegelArticleIE
@@@ -737,7 -736,6 +738,7 @@@ from .tmz import 
      TMZArticleIE,
  )
  from .tnaflix import (
 +    TNAFlixNetworkEmbedIE,
      TNAFlixIE,
      EMPFlixIE,
      MovieFapIE,
@@@ -799,11 -797,7 +800,11 @@@ from .twitch import 
      TwitchBookmarksIE,
      TwitchStreamIE,
  )
 -from .twitter import TwitterCardIE, TwitterIE
 +from .twitter import (
 +    TwitterCardIE,
 +    TwitterIE,
 +    TwitterAmplifyIE,
 +)
  from .ubu import UbuIE
  from .udemy import (
      UdemyIE,
@@@ -814,7 -808,6 +815,7 @@@ from .digiteka import DigitekaI
  from .unistra import UnistraIE
  from .urort import UrortIE
  from .ustream import UstreamIE, UstreamChannelIE
 +from .ustudio import UstudioIE
  from .varzesh3 import Varzesh3IE
  from .vbox7 import Vbox7IE
  from .veehd import VeeHDIE