[Phpmyadmin-git] [phpmyadmin/phpmyadmin] da732c: ChangeLog entry

[Marc Delisle]

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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

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


  Commit: cf13eb25835fd96007795cc41c942f650f81a01a
      https://github.com/phpmyadmin/phpmyadmin/commit/cf13eb25835fd96007795cc41c942f650f81a01a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-21 (Sat, 21 Jun 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_2'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/67a705b05332...cf13eb25835f