Merge remote-tracking branch 'sehrgut/Grooveshark'

Conflicts:
	youtube_dl/__init__.py
	youtube_dl/extractor/__init__.py
This commit is contained in:
Philipp Hagemeister 2014-08-23 16:41:14 +02:00
commit 00558d9414
3 changed files with 207 additions and 0 deletions

View file

@ -126,6 +126,7 @@ from .googleplus import GooglePlusIE
from .googlesearch import GoogleSearchIE
from .gorillavid import GorillaVidIE
from .goshgay import GoshgayIE
from .grooveshark import GroovesharkIE
from .hark import HarkIE
from .helsinki import HelsinkiIE
from .hentaistigma import HentaiStigmaIE