From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 4 Dec 2014 07:30:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'zackfern/myvidster'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=6219802165d2cda4dd128b06c9435038f43b1145;hp=-c;p=youtube-dl

Merge remote-tracking branch 'zackfern/myvidster'
---

6219802165d2cda4dd128b06c9435038f43b1145
diff --combined youtube_dl/extractor/__init__.py
index b2c7fd586,f4f66fb0b..647352b59
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -121,7 -121,6 +121,7 @@@ from .fktv import 
  from .flickr import FlickrIE
  from .folketinget import FolketingetIE
  from .fourtube import FourTubeIE
 +from .foxgay import FoxgayIE
  from .franceculture import FranceCultureIE
  from .franceinter import FranceInterIE
  from .francetv import (
@@@ -246,6 -245,7 +246,7 @@@ from .muzu import MuzuTVI
  from .myspace import MySpaceIE, MySpaceAlbumIE
  from .myspass import MySpassIE
  from .myvideo import MyVideoIE
+ from .myvidster import MyVidsterIE
  from .naver import NaverIE
  from .nba import NBAIE
  from .nbc import (