Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

ChangeLog

@@ -1,6 +1,8 @@
 phpMyAdmin - ChangeLog
 ======================
 
+4.0.1.0 (not yet released)
+
 4.0.0.0 (not yet released)
 + Patch #3481047 for rfe #3480477 Insert as new row enhancement
 + Patch #3480999 Activate codemirror in the query window

README

@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.0.0-rc3
+Version 4.0.1-dev
 
 A set of PHP-scripts to manage MySQL over the web.
 

doc/conf.py

@@ -49,7 +49,7 @@ copyright = u'2012 - 2013, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-rc3'
+version = '4.0.1-dev'
 # The full version, including alpha/beta/rc tags.
 release = version
 

libraries/Config.class.php

@@ -101,7 +101,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.0.0-rc3');
+        $this->set('PMA_VERSION', '4.0.1-dev');
         /**
          * @deprecated
          */