Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

gkwyc · Apr 3, 2013 · e46b8d6 · e46b8d6
2 parents 2c5fb8d + 79655ec
commit e46b8d6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,8 @@
 phpMyAdmin - ChangeLog
 ======================
 
+3.5.9.0 (not yet released)
+
 3.5.8.0 (not yet released)
 - bug #3828 MariaDB reported as MySQL
 - bug #3854 Incorrect header for Safari 6.0

diff --git a/Documentation.html b/Documentation.html
@@ -8,15 +8,15 @@
     <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-dev - Documentation</title>
+    <title>phpMyAdmin 3.5.9-dev - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
 <body id="top">
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.5.8-dev
+        3.5.9-dev
         Documentation
     </h1>
 </div>

diff --git a/README b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.5.8-dev
+Version 3.5.9-dev
 
 A set of PHP-scripts to manage MySQL over the web.
 

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
@@ -98,7 +98,7 @@ function __construct($source = null)
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.5.8-dev');
+        $this->set('PMA_VERSION', '3.5.9-dev');
         /**
          * @deprecated
          */