Branch: refs/heads/QA_4_0
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 9c0a4022d2df87d782e0c05ce1ac6e4ad5758598
https://github.com/phpmyadmin/phpmyadmin/commit/9c0a4022d2df87d782e0c05ce1a…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix merge conflict