[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 961451: bug #4979 Problem when import *.ods file

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 961451899925e7158d081209a68a7534b09c0d83
      https://github.com/phpmyadmin/phpmyadmin/commit/961451899925e7158d081209a68a7534b09c0d83
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-07-14 (Tue, 14 Jul 2015)

  Changed paths:
    M ChangeLog
    M libraries/plugins/import/ImportOds.class.php

  Log Message:
  -----------
  bug #4979 Problem when import *.ods file

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 6cd73329a6453d479abc3a2342dc6fa53aa0d912
      https://github.com/phpmyadmin/phpmyadmin/commit/6cd73329a6453d479abc3a2342dc6fa53aa0d912
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-07-14 (Tue, 14 Jul 2015)

  Changed paths:
    M ChangeLog
    M libraries/plugins/import/ImportOds.class.php

  Log Message:
  -----------
  Merge branch 'QA_4_4'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/57eb4283359c...6cd73329a645