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, 4 insertions, 18 deletions

diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py
index d72b12a12..dc9188f05 100644
--- a/module/plugins/hoster/FreeWayMe.py
+++ b/module/plugins/hoster/FreeWayMe.py
@@ -1,34 +1,20 @@
 # -*- 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: Nicolas Giese
-"""
-
 from module.plugins.Hoster import Hoster
 
 
 class FreeWayMe(Hoster):
     __name__ = "FreeWayMe"
-    __version__ = "0.11"
     __type__ = "hoster"
+    __version__ = "0.11"
+
     __pattern__ = r'https://(?:www\.)?free-way.me/.*'
+
     __description__ = """FreeWayMe hoster plugin"""
     __author_name__ = "Nicolas Giese"
     __author_mail__ = "james@free-way.me"
 
+
     def setup(self):
         self.resumeDownload = False
         self.chunkLimit = 1