From d72c9eba6ec389acedd5033868f5a9fae682d470 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 10 Jan 2010 12:16:33 +0000
Subject: [PATCH] 3.2.5

---
 ChangeLog                  | 2 +-
 Documentation.html         | 4 ++--
 README                     | 4 ++--
 libraries/Config.class.php | 2 +-
 translators.html           | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d4a2664ad..2675ff72d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
-3.2.5.0 (not yet released)
+3.2.5.0 (2010-01-10)
 - patch #2903400 [bookmarks] Status of bookmark table, 
   thanks to Virsacer - virsacer
 - bug [history] QueryHistoryDB is not respected
diff --git a/Documentation.html b/Documentation.html
index 288014658..1f5ecb76c 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -10,7 +10,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.2.5-rc2 - Documentation</title>
+    <title>phpMyAdmin 3.2.5 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -18,7 +18,7 @@
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.2.5-rc2 
+        3.2.5 
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index e11cd4716..0af293640 100644
--- a/README
+++ b/README
@@ -5,8 +5,8 @@ phpMyAdmin - Readme
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 3.2.5-rc2
-  -----------------
+  Version 3.2.5
+  -------------
   http://www.phpmyadmin.net/
 
     Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 33f2d5394..e01e5133a 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -92,7 +92,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.2.5-rc2');
+        $this->set('PMA_VERSION', '3.2.5');
         /**
          * @deprecated
          */
diff --git a/translators.html b/translators.html
index 8b942fbb8..ee01f019a 100644
--- a/translators.html
+++ b/translators.html
@@ -8,7 +8,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.2.5-rc2 - Official translators</title>
+    <title>phpMyAdmin 3.2.5 - Official translators</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -16,7 +16,7 @@
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.2.5-rc2 
+        3.2.5 
         official translators list
     </h1>
 </div>