Merge remote-tracking branch 'sehrgut/Grooveshark'

Conflicts:
	youtube_dl/__init__.py
	youtube_dl/extractor/__init__.py

diff --cc youtube_dl/__init__.py
index f156ba3a03ae551d54cd62fc24ddb170f23da131,cd4e9b484601212af1e73b631dde6cb97ec30279..613ce3576eb038cd335a5b10124dfbe7e1f249ea
--- 1/youtube_dl/__init__.py
--- 2/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@@ -56,21 -56,7 +56,22 @@@ __authors__  = 
      'Nicolas Évrard',
      'Jason Normore',
      'Hoje Lee',
 -    'Keith Beckman'
 +    'Adam Thalhammer',
 +    'Georg Jähnig',
 +    'Ralf Haring',
 +    'Koki Takahashi',
 +    'Ariset Llerena',
 +    'Adam Malcontenti-Wilson',
 +    'Tobias Bell',
 +    'Naglis Jonaitis',
 +    'Charles Chen',
 +    'Hassaan Ali',
 +    'Dobrosław Żybort',
 +    'David Fabijan',
 +    'Sebastian Haas',
 +    'Alexander Kirk',
 +    'Erik Johnson',
++    'Keith Beckman',
  )
  
  __license__ = 'Public Domain'

diff --cc youtube_dl/extractor/__init__.py
index ddcf2e41485394cd16f946549fc090d556dc48df,3f6c67fa568a8134ea2fceb3ee0a17e4133ec338..0d78240237efce67ac44c0aac0c1e857d0b949ee
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -121,11 -107,9 +121,12 @@@ from .gamestar import GameStarI
  from .gametrailers import GametrailersIE
  from .gdcvault import GDCVaultIE
  from .generic import GenericIE
 +from .godtube import GodTubeIE
  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