Merge remote-tracking branch 'origin/stable'

Conflicts:
	module/plugins/accounts/FilesonicCom.py
	module/plugins/accounts/OronCom.py
	module/plugins/accounts/ShareonlineBiz.py
	module/plugins/addons/UpdateManager.py
	module/plugins/crypter/FilesonicComFolder.py
	module/plugins/hoster/BezvadataCz.py
	module/plugins/hoster/EuroshareEu.py
	module/plugins/hoster/FilesonicCom.py
	module/plugins/hoster/MegauploadCom.py
	module/plugins/hoster/Premium4Me.py
	module/plugins/hoster/YoutubeCom.py
	module/plugins/internal/MultiHoster.py
	module/utils.py

1 files changed, 21 insertions, 0 deletions

diff --git a/module/plugins/hoster/SpeedLoadOrg.py b/module/plugins/hoster/SpeedLoadOrg.py
new file mode 100644
index 000000000..32e7baf13
--- /dev/null
+++ b/module/plugins/hoster/SpeedLoadOrg.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+
+class SpeedLoadOrg(XFileSharingPro):
+    __name__ = "SpeedLoadOrg"
+    __type__ = "hoster"
+    __pattern__ = r"http://(www\.)?speedload\.org/(?P<ID>\w+)"
+    __version__ = "1.01"
+    __description__ = """Speedload.org hoster plugin"""
+    __author_name__ = ("stickell")
+    __author_mail__ = ("l.stickell@yahoo.it")
+
+    FILE_NAME_PATTERN = r'Filename:</b></td><td nowrap>(?P<N>[^<]+)</td></tr>'
+    FILE_SIZE_PATTERN = r'Size:</b></td><td>[\w. ]+<small>\((?P<S>\d+) bytes\)</small>'
+
+    HOSTER_NAME = "speedload.org"
+
+    def handlePremium(self):
+        self.download(self.pyfile.url, post = self.getPostParameters())
+
+getInfo = create_getInfo(SpeedLoadOrg)