From 8dbce7e4a0e725202c3ae8d97929895bec7d5112 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 8 Apr 2013 07:58:07 -0400
Subject: [PATCH 1/2] 3.5.8 release

---
 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 8646cf8535..3f3e8511cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-3.5.8.0 (not yet released)
+3.5.8.0 (2013-04-08)
 - bug #3828 MariaDB reported as MySQL
 - bug #3854 Incorrect header for Safari 6.0
 - bug #3705 Attempt to open trigger for edit gives NULL
diff --git a/Documentation.html b/Documentation.html
index 51f96a0c41..4ad73f2c9f 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -8,7 +8,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.5.8-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.5.8 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -16,7 +16,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.5.8-rc1
+        3.5.8
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 61d57bb078..ff9a5f59b3 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.5.8-rc1
+Version 3.5.8
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index d6f11c24d9..3db7ee6eec 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -98,7 +98,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.5.8-rc1');
+        $this->set('PMA_VERSION', '3.5.8');
         /**
          * @deprecated
          */

From 25748dbad95a2fd4724762441680975a4db1306a Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 8 Apr 2013 07:59:38 -0400
Subject: [PATCH 2/2] Fix merge conflicts

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index bb95349649..6d21bae074 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@ phpMyAdmin - ChangeLog
 
 3.5.9.0 (not yet released)
 
-3.5.8.0 (not yet released)
+3.5.8.0 (2013-04-08)
 - bug #3828 MariaDB reported as MySQL
 - bug #3854 Incorrect header for Safari 6.0
 - bug #3705 Attempt to open trigger for edit gives NULL