ChangeLog entry

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin