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

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

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>

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.
 

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
          */