From 8bbbf7e0610572a54ab902feecc535e1e6a1efd3 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 15 Feb 2013 07:25:51 -0500
Subject: [PATCH 1/2] 3.5.7

---
 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 4153c0fcb3..0ec6062e65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-3.5.7.0 (not yet released)
+3.5.7.0 (2013-02-15)
 - bug #3779 [core] Problem with backslash in enum fields
 - bug #3816 Missing server_processlist.php
 - bug #3821 Safari: white page
diff --git a/Documentation.html b/Documentation.html
index 78b88e0c31..594b039adf 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.7-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.5.7 - 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.7-rc1
+        3.5.7
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 16ad2355ca..19a9c73ac0 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.5.7-rc1
+Version 3.5.7
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 641166bc33..798f417707 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.7-rc1');
+        $this->set('PMA_VERSION', '3.5.7');
         /**
          * @deprecated
          */

From 3b0323dda3d4685259c0c501affed1a2b3cd8739 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 15 Feb 2013 07:26:32 -0500
Subject: [PATCH 2/2] Fix merge conflicts

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

diff --git a/ChangeLog b/ChangeLog
index fc10ec9deb..bd2d4ecafd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@ phpMyAdmin - ChangeLog
 
 3.5.8.0 (not yet released)
 
-3.5.7.0 (not yet released)
+3.5.7.0 (2013-02-15)
 - bug #3779 [core] Problem with backslash in enum fields
 - bug #3816 Missing server_processlist.php
 - bug #3821 Safari: white page