[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 03c897: Changelog entry

[Atul Pratap Singh]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 03c89704fa0880d8bac3b008591bb3e758f23aea
      https://github.com/phpmyadmin/phpmyadmin/commit/03c89704fa0880d8bac3b008591bb3e758f23aea
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M ChangeLog

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

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


  Commit: 41df743274abc169b501cd33e6c266f99ff8c65f
      https://github.com/phpmyadmin/phpmyadmin/commit/41df743274abc169b501cd33e6c266f99ff8c65f
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d2690886e57c...41df743274ab