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

[Marc Delisle]

  Branch: refs/heads/QA_4_1
  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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9876aeb55076...7ff18f07bc50