Merge remote-tracking branch 'yan12125/IE_Yam'

diff --combined youtube_dl/extractor/__init__.py
index 13292073c2499d9b74a9157f1f80fc108a1762e2,f749ec333fec6f123babd5373e5f81ee177b52c4..5b776a7a1e99faf198e4e46e8fc9cb0f57376a86
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -189,7 -189,6 +189,7 @@@ from .hellporno import HellPornoI
  from .helsinki import HelsinkiIE
  from .hentaistigma import HentaiStigmaIE
  from .historicfilms import HistoricFilmsIE
 +from .history import HistoryIE
  from .hitbox import HitboxIE, HitboxLiveIE
  from .hornbunny import HornBunnyIE
  from .hostingbulk import HostingBulkIE
@@@ -579,6 -578,7 +579,7 @@@ from .yahoo import 
      YahooIE,
      YahooSearchIE,
  )
+ from .yam import YamIE
  from .yesjapan import YesJapanIE
  from .ynet import YnetIE
  from .youjizz import YouJizzIE