4.1.14 releaseRELEASE_4_1_14

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

4 files changed, 4 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f40c40f8a5..b79fc2cfbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.1.14.0 (not yet released)
+4.1.14.0 (2014-04-26)
 - bug #4365 Creating bookmark with multiple queries not working
 - bug #4372 Changing browser transformation results in unnecessary table rebuild
 - bug #4375 Group two DB, one's name is the prefix of the other one
diff --git a/README b/README
index 928fd5d1a4..88a7b9e04e 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.1.14-dev
+Version 4.1.14
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/doc/conf.py b/doc/conf.py
index 1b7557b675..a70c7d3d16 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-dev'
+version = '4.1.14'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 43fb6d65fd..5c8703d84f 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-dev');
+        $this->set('PMA_VERSION', '4.1.14');
         /**
          * @deprecated
          */