Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4163589b1cf44c2a0338d6e5a3b74cd920d2c8fa https://github.com/phpmyadmin/phpmyadmin/commit/4163589b1cf44c2a0338d6e5a3b7... Author: Marc Delisle <marc@infomarc.info> Date: 2012-12-01 (Sat, 01 Dec 2012) Changed paths: M ChangeLog M js/server_status.js Log Message: ----------- bug #3591412 [status] Live charts don't work for non-default server Commit: 38c2800cd0f3632b22b5a056a1c127f1b28244e9 https://github.com/phpmyadmin/phpmyadmin/commit/38c2800cd0f3632b22b5a056a1c1... Author: Marc Delisle <marc@infomarc.info> Date: 2012-12-01 (Sat, 01 Dec 2012) Log Message: ----------- Merge branch 'QA_3_5' Commit: 79c458b21c67f63dc94781777c06555129e89a91 https://github.com/phpmyadmin/phpmyadmin/commit/79c458b21c67f63dc94781777c06... Author: Marc Delisle <marc@infomarc.info> Date: 2012-12-01 (Sat, 01 Dec 2012) Changed paths: M js/server_status.js Log Message: ----------- Fix merge conflicts Commit: d04d55bda8a8b84b08d4b538de25184ce2952bcc https://github.com/phpmyadmin/phpmyadmin/commit/d04d55bda8a8b84b08d4b538de25... Author: Marc Delisle <marc@infomarc.info> Date: 2012-12-01 (Sat, 01 Dec 2012) Changed paths: M ChangeLog Log Message: ----------- Fix merge conflicts (ChangeLog) Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a5ea08eb2d6f...d04d55bda8a8