Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ceecaa41c1506dbba576e1371902ae1a23ddefc1 https://github.com/phpmyadmin/phpmyadmin/commit/ceecaa41c1506dbba576e1371902... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-02-02 (Sun, 02 Feb 2014)

Changed paths: M ChangeLog M export.php

Log Message: ----------- bug #4263 Japanese character encoding not working properly when exporting

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 94c3be7f390d8b0e43fdc7ca37e5d0aec5f631b6 https://github.com/phpmyadmin/phpmyadmin/commit/94c3be7f390d8b0e43fdc7ca37e5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-02-02 (Sun, 02 Feb 2014)

Changed paths: M ChangeLog M export.php

Log Message: ----------- Merge branch 'QA_4_1'

Conflicts: export.php

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2ca43acf8c35...94c3be7f390d