Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4382a7b7dc441fbb9bbc8feed37feffbaa2910bc https://github.com/phpmyadmin/phpmyadmin/commit/4382a7b7dc441fbb9bbc8feed37f... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2013-06-17 (Mon, 17 Jun 2013)

Changed paths: M libraries/iconv_wrapper.lib.php M test/libraries/PMA_charset_conversion_test.php M test/libraries/PMA_iconv_wrapper_test.php

Log Message: ----------- Fix failing tests related to charset conversion

Commit: e475fa3f4465b75b6d14918a2892a7edf0bcfce4 https://github.com/phpmyadmin/phpmyadmin/commit/e475fa3f4465b75b6d14918a2892... Author: Michal Čihař michal@cihar.com Date: 2013-06-17 (Mon, 17 Jun 2013)

Changed paths: M libraries/iconv_wrapper.lib.php M test/libraries/PMA_charset_conversion_test.php M test/libraries/PMA_iconv_wrapper_test.php

Log Message: ----------- Merge pull request #432 from madhuracj/fixTests

Fix failing tests related to charset conversion

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b67698f2ce2d...e475fa3f4465