4.2.1 releaseRELEASE_4_2_1

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

4 files changed, 4 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 02730eae77..4286c4bf1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.2.1.0 (not yet released)
+4.2.1.0 (2014-05-13)
 - bug #4380 Cannot display table structure with enums containing special characters 
 - bug #4381 Cannot remove the last remembered sorted column
 - bug       Correctly fetch length of user and host fields in MySQL tables
diff --git a/README b/README
index a0ea7470da..6d267ca673 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.2.1-dev
+Version 4.2.1
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/doc/conf.py b/doc/conf.py
index 84fdb09e03..b8d7c676f4 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.2.1-dev'
+version = '4.2.1'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 3c94822e45..392d6aebe2 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.2.1-dev');
+        $this->set('PMA_VERSION', '4.2.1');
         /**
          * @deprecated
          */