[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a0f83f: Merge remote-tracking branch 'origin/QA_3_5' into ...

[Michal Čihař]

  Branch: refs/heads/QA_3_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a0f83fa262c12511c7772e41f029c52fa59a2188
      https://github.com/phpmyadmin/phpmyadmin/commit/a0f83fa262c12511c7772e41f029c52fa59a2188
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server_status.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5