Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 85e5a3b5cebf5a7479779297bfcb50294f3f8725 https://github.com/phpmyadmin/phpmyadmin/commit/85e5a3b5cebf5a7479779297bfcb... Author: Michal Čihař mcihar@suse.cz Date: 2013-06-11 (Tue, 11 Jun 2013)

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

Log Message: ----------- bug #3645 Better handling of invalid ODS documents

Commit: 31f7230fa7ac939068929e737947e69012554c5f https://github.com/phpmyadmin/phpmyadmin/commit/31f7230fa7ac939068929e737947... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2013-06-11 (Tue, 11 Jun 2013)

Changed paths: M po/si.po

Log Message: ----------- Translated using Weblate (Sinhala)

Currently translated at 81.7% (2127 of 2603)

Commit: 7d4a8fa3d21ea33595ae31fa5eb9ca809e37caf7 https://github.com/phpmyadmin/phpmyadmin/commit/7d4a8fa3d21ea33595ae31fa5eb9... Author: Peter Rosa peter.rosa@pro.sk Date: 2013-06-11 (Tue, 11 Jun 2013)

Changed paths: M po/sk.po

Log Message: ----------- Translated using Weblate (Slovak)

Currently translated at 78.3% (2038 of 2603)

Commit: a0e86e92f13b8d88eaef12b368650ddc2b413ffa https://github.com/phpmyadmin/phpmyadmin/commit/a0e86e92f13b8d88eaef12b36865... Author: Weblate noreply@weblate.org Date: 2013-06-11 (Tue, 11 Jun 2013)

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

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

Commit: 999a898aa31bdcaba064f147871c4e3f44e90f01 https://github.com/phpmyadmin/phpmyadmin/commit/999a898aa31bdcaba064f147871c... Author: Michal Čihař mcihar@suse.cz Date: 2013-06-11 (Tue, 11 Jun 2013)

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

Log Message: ----------- Merge commit '85e5a3b5cebf5a7479779297bfcb50294f3f8725'

Commit: db12503e170954a22b973f3be29b190da10ca5b4 https://github.com/phpmyadmin/phpmyadmin/commit/db12503e170954a22b973f3be29b... Author: Michal Čihař mcihar@suse.cz Date: 2013-06-11 (Tue, 11 Jun 2013)

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4eefa080c711...db12503e1709