[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13186-gd3cee82

[Michal Čihař]

The branch, master has been updated
       via  d3cee82ae955ecb75b41ab5ba52769a831ab06bf (commit)
       via  3426c970b733523b9a1c965c04df02deea77daeb (commit)
       via  f9b77fd15336f68f7c7af11a8d1e0ae52cf80d1d (commit)
       via  7b9e61dac14d52d42317ea1fd4b1571d320f38b7 (commit)
      from  da95ad4e3375874595c308318450de288f559661 (commit)


- Log -----------------------------------------------------------------
commit d3cee82ae955ecb75b41ab5ba52769a831ab06bf
Merge: 3426c970b733523b9a1c965c04df02deea77daeb f9b77fd15336f68f7c7af11a8d1e0ae52cf80d1d
Author: Michal Čihař <mcihar at suse.cz>
Date:   Fri Aug 5 13:53:26 2011 +0200

    Merge remote-tracking branch 'origin/QA_3_4'
    
    Conflicts:
    	server_status.php

commit 3426c970b733523b9a1c965c04df02deea77daeb
Merge: da95ad4e3375874595c308318450de288f559661 7b9e61dac14d52d42317ea1fd4b1571d320f38b7
Author: Michal Čihař <mcihar at suse.cz>
Date:   Fri Aug 5 13:51:30 2011 +0200

    Merge remote-tracking branch 'origin/QA_3_4'

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

Summary of changes:
 server_status.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/server_status.php b/server_status.php
index d26e044..12f0f25 100644
--- a/server_status.php
+++ b/server_status.php
@@ -917,6 +917,7 @@ function printServerTraffic() {
         } elseif ($server_slave_status) {
             echo __('This MySQL server works as <b>slave</b> in <b>replication</b> process.');
         }
+        echo ' ';
         echo __('For further information about replication status on the server, please visit the <a href="#replication">replication section</a>.');
         echo '</p>';
     }


hooks/post-receive
-- 
phpMyAdmin