[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e1f043: Fix ChangeLog

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e1f043c90f3bde797a550903d58c201f760abb74
      https://github.com/phpmyadmin/phpmyadmin/commit/e1f043c90f3bde797a550903d58c201f760abb74
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix ChangeLog

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 176e642bc4ed056179d64f5b5af762747c49d637
      https://github.com/phpmyadmin/phpmyadmin/commit/176e642bc4ed056179d64f5b5af762747c49d637
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_4'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/88696e78076a...176e642bc4ed