[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 664831: Changelog entry

[Atul Pratap Singh]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6648319c62fc3f0a5b3223687e5985b6591ed9ca
      https://github.com/phpmyadmin/phpmyadmin/commit/6648319c62fc3f0a5b3223687e5985b6591ed9ca
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Changelog entry

Signed-off-by: Atul Pratap Singh <atulpratapsingh05 at gmail.com>


  Commit: 79363e9c4a3a467b069f498efaad858fb1c7cc25
      https://github.com/phpmyadmin/phpmyadmin/commit/79363e9c4a3a467b069f498efaad858fb1c7cc25
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

  Changed paths:
    M ChangeLog

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6843e1936841...79363e9c4a3a