Merge remote-tracking branch 'naglis/sockshare'

Conflicts:
	youtube_dl/extractor/__init__.py
This commit is contained in:
Philipp Hagemeister 2014-07-21 13:24:15 +02:00
commit 7dabd2ac45
2 changed files with 78 additions and 0 deletions

View file

@ -268,6 +268,7 @@ from .smotri import (
SmotriBroadcastIE,
)
from .snotr import SnotrIE
from .sockshare import SockshareIE
from .sohu import SohuIE
from .soundcloud import (
SoundcloudIE,