Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 481e89ac941cd5567ad39ee4fcec6ea3eb25e4ae https://github.com/phpmyadmin/phpmyadmin/commit/481e89ac941cd5567ad39ee4fcec... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-22 (Mon, 22 Dec 2014)

Changed paths: M ChangeLog M js/console.js

Log Message: ----------- Fix merge conflict

Signed-off-by: Marc Delisle marc@infomarc.info