Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 077916c82a1c25f45b0803b22d14bd65d08f926c https://github.com/phpmyadmin/phpmyadmin/commit/077916c82a1c25f45b0803b22d14... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-12-11 (Thu, 11 Dec 2014) Changed paths: M ChangeLog M libraries/plugins/import/ImportOds.class.php Log Message: ----------- bug #3794 failure to handle repeating empty columns when importing ODS Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: cb40e81e9ca367678eaabcdbe1dc50c4ae2ce8cd https://github.com/phpmyadmin/phpmyadmin/commit/cb40e81e9ca367678eaabcdbe1dc... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-12-11 (Thu, 11 Dec 2014) Changed paths: M ChangeLog M doc/setup.rst M libraries/relation.lib.php M po/ko.po Log Message: ----------- Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3dc13b12729a...cb40e81e9ca3