4.1.2 releaseRELEASE_4_1_2

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

4 files changed, 4 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 25b537e2dc..a1275b7ac5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.1.2.0 (not yet released)
+4.1.2.0 (2013-12-23)
 - bug #4178 Quick edit for BIT type does not work
 - bug #2760 Warn about incomplete exports
 - bug #4190 Fractional seconds cause row update even if the value is not changed
diff --git a/README b/README
index e9a76a9662..78983c079e 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.1.2-dev
+Version 4.1.2
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/doc/conf.py b/doc/conf.py
index 609be80044..290411d762 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -49,7 +49,7 @@ copyright = u'2012 - 2013, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.1.2-dev'
+version = '4.1.2'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 105f16bce6..5b5e458598 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.2-dev');
+        $this->set('PMA_VERSION', '4.1.2');
         /**
          * @deprecated
          */