[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 675e45: bug fix #2760

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 675e457f50953cb0b00e9cf2940ab6a71d6f10d3
      https://github.com/phpmyadmin/phpmyadmin/commit/675e457f50953cb0b00e9cf2940ab6a71d6f10d3
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

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

  Log Message:
  -----------
  bug fix #2760

Signed-off-by: Smita Kumari <kumarismita62 at gmail.com>


  Commit: 7ff18f07bc508c36d1dceec294e86824213defa6
      https://github.com/phpmyadmin/phpmyadmin/commit/7ff18f07bc508c36d1dceec294e86824213defa6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

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

  Log Message:
  -----------
  Merge pull request #795 from smita786/QA_4_1

bug fix #2760


  Commit: d3fc01713120fa1875c447daff94f2afc404dd3d
      https://github.com/phpmyadmin/phpmyadmin/commit/d3fc01713120fa1875c447daff94f2afc404dd3d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M export.php
    M js/export.js
    M js/messages.php

  Log Message:
  -----------
  Code cleanup

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


  Commit: 7cfc60323d41dd878f4f69b0d48533bd19cd8397
      https://github.com/phpmyadmin/phpmyadmin/commit/7cfc60323d41dd878f4f69b0d48533bd19cd8397
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for fix of bug #2760

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


  Commit: fd943ed1cdbd8fe1cacb0a386b1376bde2bd4e88
      https://github.com/phpmyadmin/phpmyadmin/commit/fd943ed1cdbd8fe1cacb0a386b1376bde2bd4e88
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

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

  Log Message:
  -----------
  Merge branch 'QA_4_1'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/207466d59ccf...fd943ed1cdbd