Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d2e217160b438a3beba78cd3d72122b8dd587168 https://github.com/phpmyadmin/phpmyadmin/commit/d2e217160b438a3beba78cd3d721... Author: Marc Delisle marc@infomarc.info Date: 2013-06-02 (Sun, 02 Jun 2013)

Changed paths: M ChangeLog M index.php

Log Message: ----------- bug #3961 Avoid Suhosin warning when in simulation mode

Commit: 61b46911f1e3dbb8e32792968ec5d28009d294b2 https://github.com/phpmyadmin/phpmyadmin/commit/61b46911f1e3dbb8e32792968ec5... Author: Marc Delisle marc@infomarc.info Date: 2013-06-02 (Sun, 02 Jun 2013)

Changed paths: M ChangeLog M index.php

Log Message: ----------- Merge branch 'QA_4_0'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8d08f9b89f66...61b46911f1e3