From 1a5b3f9867354a3c563a2479b1cda6bc89282ea9 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 16 Nov 2012 12:29:51 -0500
Subject: [PATCH 1/2] 3.5.4 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 255cb08892..b5704e2aca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-3.5.4.0 (not yet released)
+3.5.4.0 (2012-11-16))
 - bug #3570212 [edit] uuid_short() is a no-arguments function
 - bug #3569577 [edit] Add routine parameter headers not valid for "function" 
 - bug #3575799 [search] Various search operators not working as expected
diff --git a/Documentation.html b/Documentation.html
index 28da69a770..8d9bff4192 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.4-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.5.4 - 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.4-rc1
+        3.5.4
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index e48a6098dd..bab7bfabd6 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.5.4-rc1
+Version 3.5.4
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index c2fe919256..fce8224b8a 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.4-rc1');
+        $this->set('PMA_VERSION', '3.5.4');
         /**
          * @deprecated
          */

From eeee6df02f2236b70a35e7a50d87cbd48d5fb3a9 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 16 Nov 2012 12:30:43 -0500
Subject: [PATCH 2/2] Fix merge conflicts

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

diff --git a/ChangeLog b/ChangeLog
index db9674736b..9ce33a9823 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@ phpMyAdmin - ChangeLog
 - bug #3586389 [setup] Cannot switch language in /setup
 - bug #3585695 [CSS] Font size in inline query editor is way too big
 
-3.5.4.0 (not yet released)
+3.5.4.0 (2012-11-16)
 - bug #3570212 [edit] uuid_short() is a no-arguments function
 - bug #3569577 [edit] Add routine parameter headers not valid for "function" 
 - bug #3575799 [search] Various search operators not working as expected