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, 0 insertions, 30 deletions

diff --git a/module/plugins/crypter/DownloadVimeoCom.py b/module/plugins/crypter/DownloadVimeoCom.py
deleted file mode 100644
index 3e137bab1..000000000
--- a/module/plugins/crypter/DownloadVimeoCom.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import HTMLParser
-from module.plugins.Crypter import Crypter
-
-
-class DownloadVimeoCom(Crypter):
-    __name__ = 'DownloadVimeoCom'
-    __type__ = 'crypter'
-    __pattern__ = r'(?:http://vimeo\.com/\d*|http://smotri\.com/video/view/\?id=.*)'
-    __version__ = '0.1'
-    __description__ = """Vimeo.com decrypter plugin"""
-    __author_name__ = "4Christopher"
-    __author_mail__ = "4Christopher@gmx.de"
-
-    BASE_URL = 'http://downloadvimeo.com'
-
-    def decrypt(self, pyfile):
-        self.package = pyfile.package()
-        html = self.load('%s/generate?url=%s' % (self.BASE_URL, pyfile.url))
-        h = HTMLParser.HTMLParser()
-        try:
-            f = re.search(r'cmd quality="(?P<quality>[^"]+?)">\s*?(?P<URL>[^<]*?)</cmd>', html)
-        except:
-            self.logDebug('Failed to find the URL')
-        else:
-            url = h.unescape(f.group('URL'))
-            self.logDebug('Quality: %s, URL: %s' % (f.group('quality'), url))
-            self.packages.append((self.package.name, [url], self.package.folder))