Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 24af8431bb679f989e7695762a54f8099e2f7710 https://github.com/phpmyadmin/phpmyadmin/commit/24af8431bb679f989e7695762a54... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-04-21 (Sat, 21 Apr 2012)

Changed paths: M js/server_status.js M js/server_status_monitor.js

Log Message: ----------- Setting the title initially is problematic with commit faeffd3

Commit: f856db18ab58b8731c7542a10cc2c155270caa27 https://github.com/phpmyadmin/phpmyadmin/commit/f856db18ab58b8731c7542a10cc2... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-04-21 (Sat, 21 Apr 2012)

Changed paths: M js/server_status.js M js/server_status_monitor.js

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

Conflicts: js/server_status_monitor.js

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f203b45...f856db1