[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-275-g693b0a5

[Marc Delisle]

The branch, master has been updated
       via  693b0a59aad90cac2a1faf7375fd093a53ae2f65 (commit)
       via  2091a1727627d6dbdee6d9a3e8335156895d8f60 (commit)
       via  28779212196686f44650e362ec0fcfbb23140288 (commit)
       via  52f60156cb8ddc5a24fbd7c0a43c856f00391d38 (commit)
      from  db22f56fd2584508bc77cb03922020183ac8bb49 (commit)


- Log -----------------------------------------------------------------
commit 693b0a59aad90cac2a1faf7375fd093a53ae2f65
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Jan 28 04:50:14 2012 -0500

    Put back 3.6.0-dev version info

commit 2091a1727627d6dbdee6d9a3e8335156895d8f60
Merge: db22f56 2877921
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Jan 28 04:48:23 2012 -0500

    Merge branch 'QA_3_5'

-----------------------------------------------------------------------

Summary of changes:
 Documentation.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 3389933..58c087e 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -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.6.0-dev
+        3.6.0-dev 
         Documentation
     </h1>
 </div>


hooks/post-receive
-- 
phpMyAdmin