Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a30405fe0bbd97d6fae1a38908e53defc6c7bc94 https://github.com/phpmyadmin/phpmyadmin/commit/a30405fe0bbd97d6fae1a38908e5... Author: Marc Delisle marc@infomarc.info Date: 2014-06-20 (Fri, 20 Jun 2014)

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

Log Message: ----------- bug #4467 shell_exec() has been disabled for security reasons

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

Commit: 67a705b05332b00cfdd8b14664ba67d8d93b0d7e https://github.com/phpmyadmin/phpmyadmin/commit/67a705b05332b00cfdd8b14664ba... Author: Marc Delisle marc@infomarc.info Date: 2014-06-20 (Fri, 20 Jun 2014)

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

Log Message: ----------- Merge branch 'QA_4_2'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5697fecf8163...67a705b05332