Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/Keep2ShareCc.py
	module/plugins/captcha/OCR.py
	module/plugins/captcha/captcha.py
	module/plugins/crypter/DailymotionBatch.py
	module/plugins/crypter/DailymotionComFolder.py
	module/plugins/crypter/YoutubeBatch.py
	module/plugins/crypter/YoutubeComFolder.py
	module/plugins/internal/CaptchaService.py
	pyload/plugin/Extractor.py
	pyload/plugin/OCR.py
	pyload/plugin/account/DebridItaliaCom.py
	pyload/plugin/account/MegaRapidCz.py
	pyload/plugin/account/NoPremiumPl.py
	pyload/plugin/account/RapideoPl.py
	pyload/plugin/addon/AndroidPhoneNotify.py
	pyload/plugin/addon/Checksum.py
	pyload/plugin/addon/ClickAndLoad.py
	pyload/plugin/addon/DeleteFinished.py
	pyload/plugin/addon/DownloadScheduler.py
	pyload/plugin/addon/ExternalScripts.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/addon/HotFolder.py
	pyload/plugin/addon/IRCInterface.py
	pyload/plugin/addon/JustPremium.py
	pyload/plugin/addon/MergeFiles.py
	pyload/plugin/addon/MultiHome.py
	pyload/plugin/addon/RestartFailed.py
	pyload/plugin/addon/RestartSlow.py
	pyload/plugin/addon/SkipRev.py
	pyload/plugin/addon/UnSkipOnFail.py
	pyload/plugin/addon/UpdateManager.py
	pyload/plugin/addon/WindowsPhoneNotify.py
	pyload/plugin/crypter/DDLMusicOrg.py
	pyload/plugin/crypter/DailymotionBatch.py
	pyload/plugin/crypter/DevhostSt.py
	pyload/plugin/crypter/EmbeduploadCom.py
	pyload/plugin/crypter/MultiloadCz.py
	pyload/plugin/crypter/YoutubeBatch.py
	pyload/plugin/extractor/SevenZip.py
	pyload/plugin/extractor/UnRar.py
	pyload/plugin/extractor/UnZip.py
	pyload/plugin/hook/BypassCaptcha.py
	pyload/plugin/hook/Captcha9Kw.py
	pyload/plugin/hook/CaptchaBrotherhood.py
	pyload/plugin/hook/DeathByCaptcha.py
	pyload/plugin/hook/ExpertDecoders.py
	pyload/plugin/hook/ImageTyperz.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/AlldebridCom.py
	pyload/plugin/hoster/CzshareCom.py
	pyload/plugin/hoster/EuroshareEu.py
	pyload/plugin/hoster/FastixRu.py
	pyload/plugin/hoster/FastshareCz.py
	pyload/plugin/hoster/GooIm.py
	pyload/plugin/hoster/MediafireCom.py
	pyload/plugin/hoster/MegaDebridEu.py
	pyload/plugin/hoster/NitroflareCom.py
	pyload/plugin/hoster/OverLoadMe.py
	pyload/plugin/hoster/PremiumTo.py
	pyload/plugin/hoster/PremiumizeMe.py
	pyload/plugin/hoster/RapidgatorNet.py
	pyload/plugin/hoster/RealdebridCom.py
	pyload/plugin/hoster/SimplyPremiumCom.py
	pyload/plugin/hoster/SimplydebridCom.py
	pyload/plugin/hoster/SmoozedCom.py
	pyload/plugin/hoster/SoundcloudCom.py
	pyload/plugin/hoster/UlozTo.py
	pyload/plugin/hoster/UploadableCh.py
	pyload/plugin/hoster/UploadedTo.py
	pyload/plugin/hoster/UploadheroCom.py
	pyload/plugin/hoster/VeehdCom.py
	pyload/plugin/hoster/VimeoCom.py
	pyload/plugin/hoster/ZeveraCom.py
	pyload/plugin/hoster/ZippyshareCom.py
	pyload/plugin/internal/BasePlugin.py
	pyload/plugin/internal/MultiHoster.py
	pyload/plugin/internal/SimpleDereferer.py
	pyload/plugin/internal/SimpleHoster.py
	pyload/plugin/internal/XFSHoster.py
	pyload/plugin/ocr/GigasizeCom.py
	pyload/plugin/ocr/LinksaveIn.py
	pyload/plugin/ocr/NetloadIn.py
	pyload/plugin/ocr/ShareonlineBiz.py

4 files changed, 10 insertions, 10 deletions

diff --git a/pyload/plugin/ocr/GigasizeCom.py b/pyload/plugin/ocr/GigasizeCom.py
index 6982e6ca9..efa513a7e 100644
--- a/pyload/plugin/ocr/GigasizeCom.py
+++ b/pyload/plugin/ocr/GigasizeCom.py
@@ -6,7 +6,7 @@ from pyload.plugin.OCR import OCR
 class GigasizeCom(OCR):
     __name__    = "GigasizeCom"
     __type__    = "ocr"
-    __version__ = "0.10"
+    __version__ = "0.11"
 
     __description__ = """Gigasize.com ocr plugin"""
     __license__     = "GPLv3"
diff --git a/pyload/plugin/ocr/LinksaveIn.py b/pyload/plugin/ocr/LinksaveIn.py
index 7ced74f4b..ddffb190a 100644
--- a/pyload/plugin/ocr/LinksaveIn.py
+++ b/pyload/plugin/ocr/LinksaveIn.py
@@ -15,7 +15,7 @@ from pyload.plugin.OCR import OCR
 class LinksaveIn(OCR):
     __name__    = "LinksaveIn"
     __type__    = "ocr"
-    __version__ = "0.10"
+    __version__ = "0.11"
 
     __description__ = """Linksave.in ocr plugin"""
     __license__     = "GPLv3"
@@ -46,7 +46,7 @@ class LinksaveIn(OCR):
             pix = frame.load()
             for x in xrange(frame.size[0]):
                 for y in xrange(frame.size[1]):
-                    if lut[pix[x, y]] != (0,0,0):
+                    if lut[pix[x, y]] != (0, 0, 0):
                         npix[x, y] = lut[pix[x, y]]
             frame_nr += 1
         new.save(self.data_dir+"unblacked.png")
@@ -112,7 +112,7 @@ class LinksaveIn(OCR):
                 rgb_bg = bglut[bgpix[x, y]]
                 rgb_c = lut[pix[x, y]]
                 if rgb_c == rgb_bg:
-                    orgpix[x, y] = (255,255,255)
+                    orgpix[x, y] = (255, 255, 255)
 
 
     def eval_black_white(self):
@@ -126,13 +126,13 @@ class LinksaveIn(OCR):
                 r, g, b = rgb
                 pix[x, y] = (255,255,255)
                 if r > max(b, g)+thresh:
-                    pix[x, y] = (0,0,0)
+                    pix[x, y] = (0, 0, 0)
                 if g < min(r, b):
-                    pix[x, y] = (0,0,0)
+                    pix[x, y] = (0, 0, 0)
                 if g > max(r, b)+thresh:
-                    pix[x, y] = (0,0,0)
+                    pix[x, y] = (0, 0, 0)
                 if b > max(r, g)+thresh:
-                    pix[x, y] = (0,0,0)
+                    pix[x, y] = (0, 0, 0)
         self.image = new
         self.pixels = self.image.load()
 
diff --git a/pyload/plugin/ocr/NetloadIn.py b/pyload/plugin/ocr/NetloadIn.py
index 8939b5318..bc5c4d882 100644
--- a/pyload/plugin/ocr/NetloadIn.py
+++ b/pyload/plugin/ocr/NetloadIn.py
@@ -6,7 +6,7 @@ from pyload.plugin.OCR import OCR
 class NetloadIn(OCR):
     __name__    = "NetloadIn"
     __type__    = "ocr"
-    __version__ = "0.10"
+    __version__ = "0.11"
 
     __description__ = """Netload.in ocr plugin"""
     __license__     = "GPLv3"
diff --git a/pyload/plugin/ocr/ShareonlineBiz.py b/pyload/plugin/ocr/ShareonlineBiz.py
index bbc3d1762..dc0894d4f 100644
--- a/pyload/plugin/ocr/ShareonlineBiz.py
+++ b/pyload/plugin/ocr/ShareonlineBiz.py
@@ -6,7 +6,7 @@ from pyload.plugin.OCR import OCR
 class ShareonlineBiz(OCR):
     __name__    = "ShareonlineBiz"
     __type__    = "ocr"
-    __version__ = "0.10"
+    __version__ = "0.11"
 
     __description__ = """Shareonline.biz ocr plugin"""
     __license__     = "GPLv3"