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

Changed paths: M ChangeLog M sql.php

Log Message: ----------- bug #3515666 [display] Profiling chart shows wrong data

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

Changed paths: M ChangeLog M sql.php

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

Conflicts: sql.php

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/54e34e5...e8dc6f8