Merge branch 'master' of github.com:piwik/piwik2.1-rc1

9 files changed, 1 insertions, 2 deletions

diff --git a/core/FrontController.php b/core/FrontController.php
index f052c4076b..bfde6328fb 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -256,7 +256,6 @@ class FrontController extends Singleton
                 '/tmp/',
                 '/tmp/assets/',
                 '/tmp/cache/',
-                '/tmp/climulti/',
                 '/tmp/logs/',
                 '/tmp/tcpdf/',
                 '/tmp/templates_c/',
diff --git a/core/Version.php b/core/Version.php
index e843d25115..6f7cdcdd4c 100644
--- a/core/Version.php
+++ b/core/Version.php
@@ -21,5 +21,5 @@ final class Version
      * The current Piwik version.
      * @var string
      */
-    const VERSION = '2.0.4-b12';
+    const VERSION = '2.1-rc1';
 }
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
-Subproject e46d7a20937f2bb880a9e6478069a42e71b271c
+Subproject 6372a3ab891d3c86553fdd080b302d1918bd5eb
diff --git a/plugins/PleineLune b/plugins/PleineLune
-Subproject 68987f2d86307d5f3524fcf0373fa1ab0f6af87
+Subproject 51ed2c8b396ac912e9039594c085348467d39b8
diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
-Subproject cd98a60c785ce56b45e4d142e9af3a470619a60
+Subproject c5054955644b2895b30b92033124891e44717fb
diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
-Subproject f6e252d5dc5e3cf004263f7450c2ca55bd2c5a7
+Subproject 0f03d07bd3f1b2533b634804b66005bf5c6ce8d
diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization
-Subproject 2cb15300a88f7ff2a1fc27ef633a1a1f4d5fef0
+Subproject 19978cb7cd926ec0fba111ce257b8f0450f34ce
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
-Subproject 0e0066e5358aea60026b8f53bd7a33e854dbb67
+Subproject 14a14c66d15d5d2563aadd4a57697e5492ba36c
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
-Subproject ba9eecdcc8be1a0a3114c99e9810b9b98ff15af
+Subproject 2d61d5b15dbbaf9924eb0b534bac59c55d03d20