[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cce1fa: Fix merge conflicts

4 Aug 2013


      Branch: refs/heads/QA_4_0
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cce1fa2735914a51ebb6f06505ed5f309a2bcec3
      https://github.com/phpmyadmin/phpmyadmin/commit/cce1fa2735914a51ebb6f06505ed...
  Author: Marc Delisle <marc@infomarc.info>
  Date:   2013-08-04 (Sun, 04 Aug 2013)

  Changed paths:
    M ChangeLog

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