From 5ff7adb3989bca9278e8adfe9324f59d168902b2 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 3 May 2012 12:31:54 -0400
Subject: [PATCH 1/2] 3.5.1 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 7ec8f40e05..56aa13aa38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-3.5.1.0 (not yet released)
+3.5.1.0 (2012-05-03)
 - bug #3510784 [edit] Limit clause ignored when sort order is remembered
 - bug #3511471 [interface] View name not seen in navi panel (MySQL 5.1)
 - bug #3512916 [display] Right frame reloads after displaying SQL result(zero rows)
diff --git a/Documentation.html b/Documentation.html
index c19f934312..71693c087d 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.5.1-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.5.1 - 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.5.1-rc1
+        3.5.1
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 903b5b2fbe..029784c608 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.5.1-rc1
+Version 3.5.1
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 4f46763fc0..774ea7fcec 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.1-rc1');
+        $this->set('PMA_VERSION', '3.5.1');
         /**
          * @deprecated
          */

From d212e1a3ea0ae73f8305db24b386daae0d3ff58e Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 3 May 2012 12:34:08 -0400
Subject: [PATCH 2/2] Fix merge conflicts

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

diff --git a/ChangeLog b/ChangeLog
index 38e759bedb..96ea8b20a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,7 @@ phpMyAdmin - ChangeLog
 - bug [GUI] Invalid HTML code on transformation_overview.php
 - bug #3522930 [browse] Missing validation in Ajax mode
 
-3.5.1.0 (not yet released)
+3.5.1.0 (2012-05-03)
 - bug #3510784 [edit] Limit clause ignored when sort order is remembered
 - bug #3511471 [interface] View name not seen in navi panel (MySQL 5.1)
 - bug #3512916 [display] Right frame reloads after displaying SQL result(zero rows)