Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c1194ccd4ea3e1c3dbe3be837a5d2cafd2f0896a https://github.com/phpmyadmin/phpmyadmin/commit/c1194ccd4ea3e1c3dbe3be837a5d... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2013-11-05 (Tue, 05 Nov 2013)

Changed paths: M libraries/charset_conversion.lib.php

Log Message: ----------- Fix PMA_convertString which use a wrong variable.

Commit: e60415574af14f13d8728ea923cad5060c8e4d10 https://github.com/phpmyadmin/phpmyadmin/commit/e60415574af14f13d8728ea923ca... Author: Michal Čihař michal@cihar.com Date: 2013-11-05 (Tue, 05 Nov 2013)

Changed paths: M libraries/charset_conversion.lib.php

Log Message: ----------- Merge pull request #741 from Tithugues/fix-convertString

Fix PMA_convertString which use a wrong variable.

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2f3e1ea15a26...e60415574af1