Merge remote-tracking branch 'jaimeMF/f4m'

Conflicts:
	youtube_dl/extractor/__init__.py
This commit is contained in:
Philipp Hagemeister 2014-02-15 15:32:13 +01:00
commit 4edff78531
5 changed files with 381 additions and 24 deletions

View file

@ -209,6 +209,7 @@ from .statigram import StatigramIE
from .steam import SteamIE
from .streamcloud import StreamcloudIE
from .streamcz import StreamCZIE
from .syfy import SyfyIE
from .sztvhu import SztvHuIE
from .teamcoco import TeamcocoIE
from .techtalks import TechTalksIE