[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_4_9-53-g91f03f1

[Marc Delisle]

The branch, TESTING has been updated
       via  91f03f1ceca67bec7b7a4b2cca9ab699b71c59cb (commit)
       via  2506fbfac68115e54632bc065a292d59b922fe59 (commit)
      from  0117e0adf423f9f28d5f21ff79e442bc39dad68f (commit)


- Log -----------------------------------------------------------------
commit 91f03f1ceca67bec7b7a4b2cca9ab699b71c59cb
Merge: 0117e0a 2506fbf
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Dec 21 15:08:24 2011 -0500

    Merge branch 'MAINT_3_4_9' into TESTING

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |    2 +-
 Documentation.html         |    4 ++--
 README                     |    2 +-
 libraries/Config.class.php |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb729a0..219fb8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-3.4.9.0 (not yet released)
+3.4.9.0 (2011-12-21)
 - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown
 - bug #3442004 [interface] DB suggestion not correct for user with underscore
 - bug #3438420 [core] Magic quotes removed in PHP 5.4
diff --git a/Documentation.html b/Documentation.html
index 60c1ca1..87cf85c 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     <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.4.9-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.4.9 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.4.9-rc1
+        3.4.9
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 9eae673..5cb1a6a 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.4.9-rc1
+Version 3.4.9
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index e5e171a..7749020 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -96,7 +96,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.4.9-rc1');
+        $this->set('PMA_VERSION', '3.4.9');
         /**
          * @deprecated
          */


hooks/post-receive
-- 
phpMyAdmin