Merge branch 'pr/n1997_GammaC0de' into stable

Conflicts:
	module/plugins/internal/Base.py

1 files changed, 2 insertions, 1 deletions

diff --git a/module/plugins/internal/Base.py b/module/plugins/internal/Base.py
index c2f3a6e98..e3aaf202b 100644
--- a/module/plugins/internal/Base.py
+++ b/module/plugins/internal/Base.py
@@ -3,6 +3,7 @@
 import inspect
 import mimetypes
 import os
+import re
 import time
 import urlparse
 
@@ -46,7 +47,7 @@ def check_abort(fn):
 class Base(Plugin):
     __name__    = "Base"
     __type__    = "base"
-    __version__ = "0.10"
+    __version__ = "0.11"
     __status__  = "testing"
 
     __pattern__ = r'^unmatchable$'