From a0a3237d6720d1c6f3b702c7198cf1c225302f6c Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 2 Mar 2007 17:35:25 +0000
Subject: [PATCH] 2.10.0.2 release

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

diff --git a/ChangeLog b/ChangeLog
index eab5c938cb..f0808076a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL$
 
+2007-03-02 Marc Delisle  <lem9@users.sourceforge.net>
+    ### 2.10.0.2 released from MAINT_2_10_0
+
 2007-03-01 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/common.lib.php: bug #1671813 CVE-2006-1549 deep recursion crash
 
@@ -12,7 +15,7 @@ $HeadURL$
     * libraries/config.default.php: set $cfg['Servers'][$i]['ssl'] default
       value to false, we got reports from some users having problems with the
       default value of true
-    ### 2.10.0.1 released
+    ### 2.10.0.1 released from MAINT_2_10_0
 
 2007-02-27 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php: bug #1659176, memory error displaying
diff --git a/Documentation.html b/Documentation.html
index 2d1520b59d..db395e80b6 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -11,7 +11,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=iso-8859-1" />
-    <title>phpMyAdmin 2.10.0.1 - Documentation</title>
+    <title>phpMyAdmin 2.10.0.2 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -33,7 +33,7 @@
     <li><a href="#glossary">Glossary</a></li>
 </ul>
 
-<h1>phpMyAdmin 2.10.0.1 Documentation</h1>
+<h1>phpMyAdmin 2.10.0.2 Documentation</h1>
 
 <ul><li><a href="http://www.phpmyadmin.net/">
             phpMyAdmin homepage</a></li>
diff --git a/README b/README
index 0d69f49f72..fabb8c29f7 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ phpMyAdmin - Readme
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 2.10.0.1
+  Version 2.10.0.2
   ----------------
   http://www.phpmyadmin.net/
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 4efbf9b9c1..4da17f0038 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -81,7 +81,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '2.10.0.1');
+        $this->set('PMA_VERSION', '2.10.0.2');
         /**
          * @deprecated
          */
diff --git a/translators.html b/translators.html
index dd47ac6c99..a10a37530a 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=iso-8859-1" />
-    <title>phpMyAdmin 2.10.0.1 - Official translators</title>
+    <title>phpMyAdmin 2.10.0.2 - Official translators</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -31,7 +31,7 @@
     <li><a href="Documentation.html#glossary">Glossary</a></li>
 </ul>
 
-<h1>phpMyAdmin 2.10.0.1 official translators list</h1>
+<h1>phpMyAdmin 2.10.0.2 official translators list</h1>
 
 <p> Here is the list of the &quot;official translators&quot; of
     phpMyAdmin.</p>
-- 
2.11.4.GIT