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, 5 insertions, 2 deletions

diff --git a/module/plugins/hoster/Premium4Me.py b/module/plugins/hoster/Premium4Me.py
index cd47a9e91..2679916e9 100644
--- a/module/plugins/hoster/Premium4Me.py
+++ b/module/plugins/hoster/Premium4Me.py
@@ -3,10 +3,13 @@
 

 from urllib import quote

 from module.plugins.Hoster import Hoster

+from module.utils import fs_encode

+from os.path import exists

+from os import remove

 

 class Premium4Me(Hoster):

     __name__ = "Premium4Me"

-    __version__ = "0.10"

+    __version__ = "0.04"

     __type__ = "hoster"

 

     __pattern__ = r"http://premium4.me/.*"

@@ -55,4 +58,4 @@ class Premium4Me(Hoster):
             traffic = int(self.load ("http://premium4.me/api/traffic.php?authcode=%s" % self.account.authcode))

         except:

             traffic = 0 

-        return traffic       
\ No newline at end of file
+        return traffic