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

ChangeLog

@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.6.0.0 (not yet released)
+4.6.0.0 (2016-03-22)
 + issue #11456 Disabled storage engines
 + issue #11479 Allow setting routine wise privileges
 - issue        Hide Insert tab for non-updatable views

README

@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.6.0-rc2
+Version 4.6.0
 
 A web interface for MySQL and MariaDB.
 

doc/conf.py

@@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.6.0-rc2'
+version = '4.6.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 

libraries/Config.php

@@ -101,7 +101,7 @@ class Config
      */
     public function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.6.0-rc2');
+        $this->set('PMA_VERSION', '4.6.0');
         /**
          * @deprecated
          */