Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: aab6b291a91f63efd64bae4ef2b157626715b206 https://github.com/phpmyadmin/phpmyadmin/commit/aab6b291a91f63efd64bae4ef2b1... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-08 (Mon, 08 Dec 2014)

Changed paths: M libraries/export.lib.php

Log Message: ----------- Add comment explaining why strlen is used in place of mb_strlen

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

Commit: 2d18ea2d4ca407fcb0c90224e008659950b9bade https://github.com/phpmyadmin/phpmyadmin/commit/2d18ea2d4ca407fcb0c90224e008... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-08 (Mon, 08 Dec 2014)

Changed paths: M ChangeLog M libraries/DisplayResults.class.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/18477cc46737...2d18ea2d4ca4