From: Sergey M․ <dstftw@gmail.com>
Date: Sat, 15 Aug 2015 19:06:38 +0000 (+0600)
Subject: Merge branch 'playtvak' of https://github.com/oskar456/youtube-dl into oskar456-playtvak
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=ea99110d247d3c27f1cc2e2cb8c6f73c6405c383;hp=-c;p=youtube-dl

Merge branch 'playtvak' of https://github.com/oskar456/youtube-dl into oskar456-playtvak
---

ea99110d247d3c27f1cc2e2cb8c6f73c6405c383
diff --combined youtube_dl/extractor/__init__.py
index 7459a1944,5307240f8..fa9acc923
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -158,7 -158,6 +158,7 @@@ from .eporner import EpornerI
  from .eroprofile import EroProfileIE
  from .escapist import EscapistIE
  from .espn import ESPNIE
 +from .esri import EsriVideoIE
  from .everyonesmixtape import EveryonesMixtapeIE
  from .exfm import ExfmIE
  from .expotv import ExpoTVIE
@@@ -449,6 -448,7 +449,7 @@@ from .planetaplay import PlanetaPlayI
  from .pladform import PladformIE
  from .played import PlayedIE
  from .playfm import PlayFMIE
+ from .playtvak import PlaytvakIE
  from .playvid import PlayvidIE
  from .playwire import PlaywireIE
  from .podomatic import PodomaticIE
@@@ -523,7 -523,6 +524,7 @@@ from .senateisvp import SenateISVPI
  from .servingsys import ServingSysIE
  from .sexu import SexuIE
  from .sexykarma import SexyKarmaIE
 +from .shahid import ShahidIE
  from .shared import SharedIE
  from .sharesix import ShareSixIE
  from .sina import SinaIE