Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/Account.py
	module/plugins/AccountManager.py
	module/plugins/Hook.py
	module/plugins/OCR.py
	module/plugins/Plugin.py
	module/plugins/PluginManager.py
	module/plugins/ReCaptcha.py
	module/plugins/accounts/Ftp.py
	module/plugins/accounts/Http.py
	module/plugins/internal/MultiHoster.py
	module/plugins/ocr/GigasizeCom.py
	module/plugins/ocr/LinksaveIn.py
	module/plugins/ocr/NetloadIn.py
	module/plugins/ocr/ShareonlineBiz.py

1 files changed, 3 insertions, 18 deletions

diff --git a/module/plugins/accounts/RapidgatorNet.py b/module/plugins/accounts/RapidgatorNet.py
index c008a0db3..849933a87 100644
--- a/module/plugins/accounts/RapidgatorNet.py
+++ b/module/plugins/accounts/RapidgatorNet.py
@@ -1,36 +1,21 @@
 # -*- coding: utf-8 -*-
 
-"""
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License,
-    or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-    @author: zoidberg
-"""
-
 from module.plugins.Account import Account
 from module.common.json_layer import json_loads
 
 
 class RapidgatorNet(Account):
     __name__ = "RapidgatorNet"
-    __version__ = "0.04"
     __type__ = "account"
+    __version__ = "0.04"
+
     __description__ = """Rapidgator.net account plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
     API_URL = 'http://rapidgator.net/api/user'
 
+
     def loadAccountInfo(self, user, req):
         try:
             sid = self.getAccountData(user).get('SID')