Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2e7bcfcee4332435e3a44ebfda02b5ff18ba149b https://github.com/phpmyadmin/phpmyadmin/commit/2e7bcfcee4332435e3a44ebfda02... Author: Marc Delisle marc@infomarc.info Date: 2015-05-02 (Sat, 02 May 2015)

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

Log Message: ----------- bug #4830 Maximum execution time exceeded in Util.class.php (better fix)

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 7c43077a02e3a38d8b4bc557c2db2bd267d341d2 https://github.com/phpmyadmin/phpmyadmin/commit/7c43077a02e3a38d8b4bc557c2db... Author: Marc Delisle marc@infomarc.info Date: 2015-05-02 (Sat, 02 May 2015)

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

Log Message: ----------- Merge branch 'QA_4_4'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6204da5a3dba...7c43077a02e3