From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Sun, 3 Nov 2013 11:28:02 +0000 (-0800)
Subject: Merge pull request #1677 from rzhxeo/xtube
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=d60703875307f969f84a8907a332adce7835c080;hp=-c

Merge pull request #1677 from rzhxeo/xtube

Add support for http://www.xtube.com
---

d60703875307f969f84a8907a332adce7835c080
diff --combined youtube_dl/extractor/__init__.py
index f44f4214f,7efd097e4..8dad38a00
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -9,7 -9,6 +9,7 @@@ from .arte import 
      ArteTVFutureIE,
  )
  from .auengine import AUEngineIE
 +from .bambuser import BambuserIE, BambuserChannelIE
  from .bandcamp import BandcampIE
  from .bliptv import BlipTVIE, BlipTVUserIE
  from .bloomberg import BloombergIE
@@@ -40,7 -39,6 +40,7 @@@ from .ehow import EHowI
  from .eighttracks import EightTracksIE
  from .escapist import EscapistIE
  from .exfm import ExfmIE
 +from .extremetube import ExtremeTubeIE
  from .facebook import FacebookIE
  from .faz import FazIE
  from .fktv import (
@@@ -85,7 -83,6 +85,7 @@@ from .mit import TechTVMITIE, MITI
  from .mixcloud import MixcloudIE
  from .mtv import MTVIE
  from .muzu import MuzuTVIE
 +from .myspace import MySpaceIE
  from .myspass import MySpassIE
  from .myvideo import MyVideoIE
  from .naver import NaverIE
@@@ -144,7 -141,6 +144,7 @@@ from .videofyme import VideofyMeI
  from .videopremium import VideoPremiumIE
  from .vimeo import VimeoIE, VimeoChannelIE
  from .vine import VineIE
 +from .vk import VKIE
  from .wat import WatIE
  from .websurg import WeBSurgIE
  from .weibo import WeiboIE
@@@ -153,6 -149,7 +153,7 @@@ from .worldstarhiphop import WorldStarH
  from .xhamster import XHamsterIE
  from .xnxx import XNXXIE
  from .xvideos import XVideosIE
+ from .xtube import XTubeIE
  from .yahoo import YahooIE, YahooSearchIE
  from .youjizz import YouJizzIE
  from .youku import YoukuIE