From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 21 Jul 2014 11:24:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'naglis/sockshare'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=7dabd2ac45a53bc608390a72c2d43044aaf6efb8

Merge remote-tracking branch 'naglis/sockshare'

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

7dabd2ac45a53bc608390a72c2d43044aaf6efb8
diff --cc youtube_dl/extractor/__init__.py
index a4c7c713a,f3575b6c9..8d63d9281
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -267,7 -262,7 +267,8 @@@ from .smotri import 
      SmotriUserIE,
      SmotriBroadcastIE,
  )
 +from .snotr import SnotrIE
+ from .sockshare import SockshareIE
  from .sohu import SohuIE
  from .soundcloud import (
      SoundcloudIE,