Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0425d898bf56f0681676414299da935c6e154e6d https://github.com/phpmyadmin/phpmyadmin/commit/0425d898bf56f0681676414299da... Author: Marc Delisle <marc@infomarc.info> Date: 2013-08-28 (Wed, 28 Aug 2013) Changed paths: M ChangeLog M server_databases.php Log Message: ----------- bug #3993 Sorting in database overview with statistics doesn't work Commit: 66da35776b884152f58b0866e770c90c24cda358 https://github.com/phpmyadmin/phpmyadmin/commit/66da35776b884152f58b0866e770... Author: Marc Delisle <marc@infomarc.info> Date: 2013-08-28 (Wed, 28 Aug 2013) Changed paths: M ChangeLog M libraries/server_databases.lib.php Log Message: ----------- Fix merge conflicts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/586f1cda001e...66da35776b88