[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d80cc2: Forgot to correctly merge changelog

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d80cc280879928279cb633457b5054e3b27972fd
      https://github.com/phpmyadmin/phpmyadmin/commit/d80cc280879928279cb633457b5054e3b27972fd
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Forgot to correctly merge changelog