Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2bf723b85e618f3afd61bf96f51f425ccd98ffd4 https://github.com/phpmyadmin/phpmyadmin/commit/2bf723b85e618f3afd61bf96f51f... Author: Michal Čihař weblate@l10n.cihar.com Date: 2012-03-20 (Tue, 20 Mar 2012)

Changed paths: M server_status.php

Log Message: ----------- Merge remote-tracking branch 'origin/master'

Commit: eaf62cb12e9ac474c77c707eed014b4df60d2692 https://github.com/phpmyadmin/phpmyadmin/commit/eaf62cb12e9ac474c77c707eed01... Author: Michal Čihař mcihar@suse.cz Date: 2012-03-20 (Tue, 20 Mar 2012)

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5b8e9d0...eaf62cb