Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0f3840138f970f7ff23ce2ff46a9cd3ee2625826 https://github.com/phpmyadmin/phpmyadmin/commit/0f3840138f970f7ff23ce2ff46a9... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-04-14 (Tue, 14 Apr 2015) Changed paths: M ChangeLog M libraries/Util.class.php Log Message: ----------- bug #4207 json_encode error due to strftime returning non utf8 chars in Windows 8.1 Chinese version Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 5b8b8bc8dc2c536f3fd8178dd1e64344a67f2c02 https://github.com/phpmyadmin/phpmyadmin/commit/5b8b8bc8dc2c536f3fd8178dd1e6... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-04-14 (Tue, 14 Apr 2015) Changed paths: M ChangeLog M libraries/Util.class.php Log Message: ----------- Merge branch 'QA_4_4' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3dbc09a2b343...5b8b8bc8dc2c