[Phpmyadmin-git] [phpmyadmin/phpmyadmin] b71765: bug #4095 NUL symbols added to the end of database...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b717657de77db0b58179bdbdd88e23d0fc3d7ea6
      https://github.com/phpmyadmin/phpmyadmin/commit/b717657de77db0b58179bdbdd88e23d0fc3d7ea6
  Author: Val <valmiera-9 at inbox.lv>
  Date:   2013-09-28 (Sat, 28 Sep 2013)

  Changed paths:
    M ChangeLog
    M export.php

  Log Message:
  -----------
  bug #4095 NUL symbols added to the end of database dump file


  Commit: 77457419e1d57b69e88b99d05bb30168617c191d
      https://github.com/phpmyadmin/phpmyadmin/commit/77457419e1d57b69e88b99d05bb30168617c191d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-09-28 (Sat, 28 Sep 2013)

  Log Message:
  -----------
  Merge branch 'QA_4_0'


  Commit: 447965f984d911a0d3ad5377a31429b299c5a74c
      https://github.com/phpmyadmin/phpmyadmin/commit/447965f984d911a0d3ad5377a31429b299c5a74c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-09-28 (Sat, 28 Sep 2013)

  Changed paths:
    M ChangeLog
    M export.php

  Log Message:
  -----------
  Fix merge conflicts


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9129a60210e3...447965f984d9