Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9b7f2180df40afd85ec3c5584217d4ef0f8d525e https://github.com/phpmyadmin/phpmyadmin/commit/9b7f2180df40afd85ec3c5584217... Author: Marc Delisle marc@infomarc.info Date: 2013-02-09 (Sat, 09 Feb 2013)

Changed paths: M ChangeLog M Documentation.html M libraries/common.inc.php M libraries/config.default.php M libraries/config.values.php M libraries/server_links.inc.php M server_status.php M test/theme.php

Log Message: ----------- Bug #3816 Missing server_processlist.php

Commit: 4aa963ac875bdb5c470293c2b662b1d6fd78405b https://github.com/phpmyadmin/phpmyadmin/commit/4aa963ac875bdb5c470293c2b662... Author: Marc Delisle marc@infomarc.info Date: 2013-02-09 (Sat, 09 Feb 2013)

Log Message: ----------- Merge branch 'QA_3_5'

Commit: bcfba0d46c3996ea7d99c79c34b268d0e678d5c3 https://github.com/phpmyadmin/phpmyadmin/commit/bcfba0d46c3996ea7d99c79c34b2... Author: Marc Delisle marc@infomarc.info Date: 2013-02-09 (Sat, 09 Feb 2013)

Changed paths: M ChangeLog M doc/config.rst M libraries/ServerStatusData.class.php M libraries/common.inc.php M libraries/config.default.php M libraries/config.values.php M test/theme.php

Log Message: ----------- Fix merge conflicts

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ea2f0d01e251...bcfba0d46c39