diff --git a/ChangeLog b/ChangeLog
index a2556b6a7..09e672e2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog
$Id$
$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
-3.1.2.0 (not yet released)
+3.1.2.0 (2009-01-19)
- bug #1253252 [display] Can't NULL a column with relation defined
- bug #2009500 [SQL] Small improvements in generated SQL (partial fix)
- bug #1963184 [export] YAML export improvement,
diff --git a/Documentation.html b/Documentation.html
index 66e248146..28649ae5d 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -11,7 +11,7 @@
-
phpMyAdmin 3.1.2-rc1 - Documentation
+ phpMyAdmin 3.1.2 - Documentation
@@ -33,7 +33,7 @@
Glossary
-phpMyAdmin 3.1.2-rc1 Documentation
+phpMyAdmin 3.1.2 Documentation
-
phpMyAdmin homepage
diff --git a/README b/README
index 3edb0592b..16c1ed21b 100644
--- a/README
+++ b/README
@@ -5,8 +5,8 @@ phpMyAdmin - Readme
A set of PHP-scripts to manage MySQL over the web.
- Version 3.1.2-rc1
- -----------------
+ Version 3.1.2
+ -------------
http://www.phpmyadmin.net/
Copyright (C) 1998-2000 Tobias Ratschiller
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 75767df6a..25b929d48 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -85,7 +85,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '3.1.2-rc1');
+ $this->set('PMA_VERSION', '3.1.2');
/**
* @deprecated
*/
diff --git a/translators.html b/translators.html
index 7bb603ce3..8183a2dcd 100644
--- a/translators.html
+++ b/translators.html
@@ -8,7 +8,7 @@
- phpMyAdmin 3.1.2-rc1 - Official translators
+ phpMyAdmin 3.1.2 - Official translators
@@ -31,7 +31,7 @@
- Glossary
-phpMyAdmin 3.1.2-rc1 official translators list
+phpMyAdmin 3.1.2 official translators list
Here is the list of the "official translators" of
phpMyAdmin.