[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ebe2a3: Fix merge conflict

[Marc Delisle]

  Branch: refs/heads/QA_4_0
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ebe2a318191706381dc4a03a8a612944786abfa2
      https://github.com/phpmyadmin/phpmyadmin/commit/ebe2a318191706381dc4a03a8a612944786abfa2
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-05-24 (Fri, 24 May 2013)

  Changed paths:
    M ChangeLog

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