Merge branch 'voicerepublic' of https://github.com/duncankl/youtube-dl into duncankl...

diff --combined youtube_dl/extractor/__init__.py
index 66adb4de7576db0f11e9c59fd073b224f6cd1fb9,5cb3c304d1cf5d6ae8fe6c6bf817ebf5a4612a22..e808f2734ee75c941e1ca5df991c95d9f6b9d19d
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -324,10 -324,7 +324,10 @@@ from .nbc import 
      NBCSportsIE,
      NBCSportsVPlayerIE,
  )
 -from .ndr import NDRIE
 +from .ndr import (
 +    NDRIE,
 +    NJoyIE,
 +)
  from .ndtv import NDTVIE
  from .netzkino import NetzkinoIE
  from .nerdcubed import NerdCubedFeedIE
@@@ -637,6 -634,7 +637,7 @@@ from .vk import 
      VKUserVideosIE,
  )
  from .vodlocker import VodlockerIE
+ from .voicerepublic import VoiceRepublicIE
  from .vporn import VpornIE
  from .vrt import VRTIE
  from .vube import VubeIE