[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9c0a40: Fix merge conflict

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 9c0a4022d2df87d782e0c05ce1ac6e4ad5758598
      https://github.com/phpmyadmin/phpmyadmin/commit/9c0a4022d2df87d782e0c05ce1ac6e4ad5758598
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ChangeLog

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


  Commit: 1b0037f108f3d9e38906164f8d23bbb46c947701
      https://github.com/phpmyadmin/phpmyadmin/commit/1b0037f108f3d9e38906164f8d23bbb46c947701
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_0'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4d8e34d95455...1b0037f108f3