4.1.14.6 releaseRELEASE_4_1_14_6

Signed-off-by: Marc Delisle <marc@infomarc.info>

4 files changed, 4 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 178576d26b..3effa1d5bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.1.14.6 (not yet released)
+4.1.14.6 (2014-10-21)
 - bug #4562 [security] XSS in debug SQL output
 - bug #4563 [security] XSS in monitor query analyzer
 
diff --git a/README b/README
index ce331270e3..89e953df38 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.1.14.5
+Version 4.1.14.6
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/doc/conf.py b/doc/conf.py
index a70dde8abb..656a20106a 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -49,7 +49,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.1.14.5'
+version = '4.1.14.6'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index fe6d941914..eab70517bf 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -114,7 +114,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.1.14.5');
+        $this->set('PMA_VERSION', '4.1.14.6');
         /**
          * @deprecated
          */