Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d4c8bef2e60540ed8c03582cfdbee7813d994054 https://github.com/phpmyadmin/phpmyadmin/commit/d4c8bef2e60540ed8c03582cfdbe... Author: Marc Delisle marc@infomarc.info Date: 2014-03-25 (Tue, 25 Mar 2014)

Changed paths: M ChangeLog M libraries/plugin_interface.lib.php

Log Message: ----------- bug #4326 Cannot find the import plugins which start with uppercase 'I'

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

Commit: a1f98d9c2e8175387a120870bbbc6e9ac0e7f321 https://github.com/phpmyadmin/phpmyadmin/commit/a1f98d9c2e8175387a120870bbbc... Author: Marc Delisle marc@infomarc.info Date: 2014-03-25 (Tue, 25 Mar 2014)

Changed paths: M ChangeLog M libraries/plugin_interface.lib.php

Log Message: ----------- Fix merge conflicts

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/90948f537a3a...a1f98d9c2e81