Merge remote-tracking branch 't0mm0/x-minus'

diff --combined youtube_dl/extractor/__init__.py
index 7e91db601255fccea9bdca71c3babe73dba26d1e,45edb6a24740233fbd39ed397e778f35d26941c3..3e2133f5c0754ddf64b0447d0c5aa310e7fdb711
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -393,7 -393,6 +393,7 @@@ from .thesixtyone import TheSixtyOneI
  from .thisav import ThisAVIE
  from .tinypic import TinyPicIE
  from .tlc import TlcIE, TlcDeIE
 +from .tmz import TMZIE
  from .tnaflix import TNAFlixIE
  from .thvideo import (
      THVideoIE,
@@@ -484,6 -483,7 +484,7 @@@ from .wrzuta import WrzutaI
  from .xbef import XBefIE
  from .xboxclips import XboxClipsIE
  from .xhamster import XHamsterIE
+ from .xminus import XMinusIE
  from .xnxx import XNXXIE
  from .xvideos import XVideosIE
  from .xtube import XTubeUserIE, XTubeIE