Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1afc95134e866a9cd1bd6b1430f786f5f3d787c8 https://github.com/phpmyadmin/phpmyadmin/commit/1afc95134e866a9cd1bd6b1430f7... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-04-21 (Mon, 21 Apr 2014)

Changed paths: M ChangeLog M libraries/navigation/NavigationTree.class.php

Log Message: ----------- Bug fix: #4375 Group two DB, one's name is the prefix of the other one.

Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com

Commit: d81cd1a148d7c9388d3706878990c1fbd1c79e07 https://github.com/phpmyadmin/phpmyadmin/commit/d81cd1a148d7c9388d3706878990... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-04-21 (Mon, 21 Apr 2014)

Changed paths: M ChangeLog M libraries/navigation/NavigationTree.class.php

Log Message: ----------- Merge pull request #1151 from Tithugues/b4375_4_1

Bug fix: #4375 Group two DB, one's name is the prefix of the other one.

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/026b8c278960...d81cd1a148d7