4.1.0 releaseRELEASE_4_1_0

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

4 files changed, 4 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 7d9647438c..9869855dde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.1.0.0 (not yet released)
+4.1.0.0 (2013-12-11)
 + rfe #499 On user creation, warn if the user already exists
 + Use indeterminate check all checkbox in server privileges
 + Break server_status.php functions into smaller functions
diff --git a/README b/README
index 3b6718d178..4b259ad851 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.1.0-rc3
+Version 4.1.0
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/doc/conf.py b/doc/conf.py
index 0aa16db352..219681abb4 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.0-rc3'
+version = '4.1.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index fbc03900fb..8b4a2a9418 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.0-rc3');
+        $this->set('PMA_VERSION', '4.1.0');
         /**
          * @deprecated
          */