Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d0c0d0d2074e610c34542a5969d63d78128ee515 https://github.com/phpmyadmin/phpmyadmin/commit/d0c0d0d2074e610c34542a5969d6... Author: Dieter Adriaenssens Dieter.Adriaenssens@UGent.be Date: 2013-06-24 (Mon, 24 Jun 2013)

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

Log Message: ----------- fix typo

Commit: 4f63bb6bf108fc151538f29cce9728f318b804a6 https://github.com/phpmyadmin/phpmyadmin/commit/4f63bb6bf108fc151538f29cce97... Author: Dieter Adriaenssens Dieter.Adriaenssens@UGent.be Date: 2013-06-24 (Mon, 24 Jun 2013)

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

Log Message: ----------- Merge branch 'QA_4_0'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4b7c97a95bb1...4f63bb6bf108