[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 260cb1: Revert "ChangeLog entry"

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 260cb1d98220ceeb8e9146d26505057e9a3adf0f
      https://github.com/phpmyadmin/phpmyadmin/commit/260cb1d98220ceeb8e9146d26505057e9a3adf0f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-01 (Sun, 01 Jun 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Revert "ChangeLog entry"

This reverts commit f5ee17fb40a273b0b925022be1f79183cbe0d793.

Signed-off-by: Marc Delisle <marc at infomarc.info>