Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 051b553ddede2b60f473995d3c89fdf55a043d78 https://github.com/phpmyadmin/phpmyadmin/commit/051b553ddede2b60f473995d3c89... Author: Marc Delisle <marc@infomarc.info> Date: 2013-02-15 (Fri, 15 Feb 2013) Changed paths: M ChangeLog M libraries/common.lib.php Log Message: ----------- Bug #3828 MariaDB reported as MySQL Commit: d26b112f40c50c858c27098825e72af449489f5a https://github.com/phpmyadmin/phpmyadmin/commit/d26b112f40c50c858c27098825e7... Author: Marc Delisle <marc@infomarc.info> Date: 2013-02-15 (Fri, 15 Feb 2013) Changed paths: M ChangeLog M libraries/Util.class.php Log Message: ----------- Fix merge conflict Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2246fe70ef7f...d26b112f40c5