Branch: refs/heads/QA_4_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f0232c3cda257510a3214098421527c3c663c5c2 https://github.com/phpmyadmin/phpmyadmin/commit/f0232c3cda257510a32140984215... Author: Marc Delisle marc@infomarc.info Date: 2013-06-24 (Mon, 24 Jun 2013)

Changed paths: M ChangeLog M libraries/common.inc.php

Log Message: ----------- bug #3985 Call to undefined function mb_detect_encoding

Commit: fae5e7d992510b2674a32a2ce56facfb30fb90d7 https://github.com/phpmyadmin/phpmyadmin/commit/fae5e7d992510b2674a32a2ce56f... Author: Marc Delisle marc@infomarc.info Date: 2013-06-24 (Mon, 24 Jun 2013)

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

Log Message: ----------- Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d0c0d0d2074e...fae5e7d99251