Merge remote-tracking branch 'naglis/sockshare'

Conflicts:
	youtube_dl/extractor/__init__.py

diff --cc youtube_dl/extractor/__init__.py
index a4c7c713aeec40609859fcc4d7e4cfe537169c03,f3575b6c9730fb20912dc409ec04855044925335..8d63d9281d68d496b65d025666fd4d8a2c863b06
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -267,7 -262,7 +267,8 @@@ from .smotri import 
      SmotriUserIE,
      SmotriBroadcastIE,
  )
 +from .snotr import SnotrIE
+ from .sockshare import SockshareIE
  from .sohu import SohuIE
  from .soundcloud import (
      SoundcloudIE,