Branch: refs/heads/QA_4_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 21eda1c2c42d28370b91c99017dcee7eef9691fd https://github.com/phpmyadmin/phpmyadmin/commit/21eda1c2c42d28370b91c99017dc... Author: Marc Delisle <marc@infomarc.info> Date: 2013-09-05 (Thu, 05 Sep 2013) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.0.6 release Commit: e01419b47358b86bdc5997f1d5aabea2b8dd5b06 https://github.com/phpmyadmin/phpmyadmin/commit/e01419b47358b86bdc5997f1d5aa... Author: Marc Delisle <marc@infomarc.info> Date: 2013-09-05 (Thu, 05 Sep 2013) Log Message: ----------- Merge branch 'MAINT_4_0_6' into QA_4_0 Commit: edcf5a031c2f094e4d17e1ad90b9647d5ae93226 https://github.com/phpmyadmin/phpmyadmin/commit/edcf5a031c2f094e4d17e1ad90b9... Author: Marc Delisle <marc@infomarc.info> Date: 2013-09-05 (Thu, 05 Sep 2013) Changed paths: M ChangeLog Log Message: ----------- Fix merge conflict Compare: https://github.com/phpmyadmin/phpmyadmin/compare/633b23cad7b9...edcf5a031c2f