From 87a56db0a702a23b494d80740cbf80def6a2c647 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 13 Dec 2012 07:51:10 -0500
Subject: [PATCH 1/2] 3.5.5-rc1

---
 Documentation.html         | 4 ++--
 README                     | 2 +-
 libraries/Config.class.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 3f4b0abe97..029a31c3eb 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.5-dev - Documentation</title>
+    <title>phpMyAdmin 3.5.5-rc1 - 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.5-dev
+        3.5.5-rc1
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 5267ee99d7..0fafd7249d 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.5.5-dev
+Version 3.5.5-rc1
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 0a266dbf53..00fe058da0 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.5-dev');
+        $this->set('PMA_VERSION', '3.5.5-rc1');
         /**
          * @deprecated
          */

From 3bca12a607a40b961c42d51b079e36a64de811a1 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 13 Dec 2012 07:53:12 -0500
Subject: [PATCH 2/2] 3.5.6-dev

---
 ChangeLog                  | 2 ++
 Documentation.html         | 4 ++--
 README                     | 2 +-
 libraries/Config.class.php | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b22d15c79a..4e3f3c13fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 phpMyAdmin - ChangeLog
 ======================
 
+3.5.6.0 (not yet released)
+
 3.5.5.0 (not yet released)
 - bug #3563824 [export] Support Apache's mod_deflate
 - bug #3585523 [interface] Inline query editing broken after row update
diff --git a/Documentation.html b/Documentation.html
index 3f4b0abe97..ab10c8f072 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.5-dev - Documentation</title>
+    <title>phpMyAdmin 3.5.6-dev - 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.5-dev
+        3.5.6-dev
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 5267ee99d7..3dc6841e6a 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.5.5-dev
+Version 3.5.6-dev
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 0a266dbf53..d8cb909047 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.5-dev');
+        $this->set('PMA_VERSION', '3.5.6-dev');
         /**
          * @deprecated
          */