Merge branch 'mwave-meetgreet' of https://github.com/pmrowla/youtube-dl into pmrowla...

diff --combined youtube_dl/extractor/extractors.py
index 00f8a7a855b8413b5f4a4bac27a2b440575e2439,9d199272188896265177f4b01f923aa2aa1eac36..88405f070ba8557cbc70ed9f7a1e8fd41b44b588
--- 1/youtube_dl/extractor/extractors.py
--- 2/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@@ -400,6 -400,7 +400,6 @@@ from .macgamestore import MacGameStoreI
  from .mailru import MailRuIE
  from .makerschannel import MakersChannelIE
  from .makertv import MakerTVIE
 -from .malemotion import MalemotionIE
  from .matchtv import MatchTVIE
  from .mdr import MDRIE
  from .metacafe import MetacafeIE
@@@ -438,7 -439,7 +438,7 @@@ from .mtv import 
  )
  from .muenchentv import MuenchenTVIE
  from .musicplayon import MusicPlayOnIE
- from .mwave import MwaveIE
+ from .mwave import MwaveIE, MwaveMeetGreetIE
  from .myspace import MySpaceIE, MySpaceAlbumIE
  from .myspass import MySpassIE
  from .myvi import MyviIE