Merge branch 'master' of https://github.com/Lovius/youtube-dl into Lovius-master

diff --combined youtube_dl/extractor/__init__.py
index 6b29e9fdd48e0eea8ce495125b93ec4becafee3e,2ae656a4cc906219e14620d19d1a40894cfb457c..94e37028188b2f15dd132806f4675474effb1247
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -140,7 -140,6 +140,7 @@@ from .hark import HarkI
  from .helsinki import HelsinkiIE
  from .hentaistigma import HentaiStigmaIE
  from .hornbunny import HornBunnyIE
 +from .hostingbulk import HostingBulkIE
  from .hotnewhiphop import HotNewHipHopIE
  from .howcast import HowcastIE
  from .howstuffworks import HowStuffWorksIE
@@@ -201,7 -200,6 +201,7 @@@ from .mitele import MiTeleI
  from .mixcloud import MixcloudIE
  from .mlb import MLBIE
  from .mpora import MporaIE
 +from .moevideo import MoeVideoIE
  from .mofosex import MofosexIE
  from .mojvideo import MojvideoIE
  from .mooshare import MooshareIE
@@@ -298,7 -296,6 +298,7 @@@ from .scivee import SciVeeI
  from .screencast import ScreencastIE
  from .servingsys import ServingSysIE
  from .shared import SharedIE
 +from .sharesix import ShareSixIE
  from .sina import SinaIE
  from .slideshare import SlideshareIE
  from .slutload import SlutloadIE
@@@ -345,6 -342,7 +345,7 @@@ from .teachingchannel import TeachingCh
  from .teamcoco import TeamcocoIE
  from .techtalks import TechTalksIE
  from .ted import TEDIE
+ from .telemb import TelembIE
  from .tenplay import TenPlayIE
  from .testurl import TestURLIE
  from .tf1 import TF1IE
@@@ -378,7 -376,6 +379,7 @@@ from .veehd import VeeHDI
  from .veoh import VeohIE
  from .vesti import VestiIE
  from .vevo import VevoIE
 +from .vgtv import VGTVIE
  from .vh1 import VH1IE
  from .viddler import ViddlerIE
  from .videobam import VideoBamIE