[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4e363f: ChangeLog entry

[Marc Delisle]

  Branch: refs/heads/QA_4_1
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 4e363fc47fb969f9cfab5e7a4da30f3596fb1f3b
      https://github.com/phpmyadmin/phpmyadmin/commit/4e363fc47fb969f9cfab5e7a4da30f3596fb1f3b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-04-10 (Thu, 10 Apr 2014)

  Changed paths:
    M ChangeLog

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

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


  Commit: abe4702d871faf1d930ea0fd77008a3a9189af25
      https://github.com/phpmyadmin/phpmyadmin/commit/abe4702d871faf1d930ea0fd77008a3a9189af25
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-04-10 (Thu, 10 Apr 2014)

  Changed paths:
    M js/export.js
    M libraries/display_export.lib.php

  Log Message:
  -----------
  Fix coding style

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


  Commit: f7c1399fee034fcf03fbec7cc788ecde6bae7571
      https://github.com/phpmyadmin/phpmyadmin/commit/f7c1399fee034fcf03fbec7cc788ecde6bae7571
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-04-10 (Thu, 10 Apr 2014)

  Changed paths:
    M po/ia.po

  Log Message:
  -----------
  Merge branch 'QA_4_1' of https://github.com/phpmyadmin/phpmyadmin into QA_4_1


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b1cc09c16a28...f7c1399fee03