Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e8f734e31aa12098c5f4a293d8ab518ed62148ba https://github.com/phpmyadmin/phpmyadmin/commit/e8f734e31aa12098c5f4a293d8ab... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2013-09-19 (Thu, 19 Sep 2013)

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

Log Message: ----------- bug #3975 Table grouping isn't implemented properly

Commit: 199a9e60bc7c64b2614550b2f21b9bf6d0398a0e https://github.com/phpmyadmin/phpmyadmin/commit/199a9e60bc7c64b2614550b2f21b... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2013-09-19 (Thu, 19 Sep 2013)

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

Log Message: ----------- Merge branch 'QA_4_0'

Conflicts: libraries/db_info.inc.php

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2d3715a61334...199a9e60bc7c