Branch: refs/heads/QA_4_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3c96596f7d897e048be4c2c85d941aadd6141ba9 https://github.com/phpmyadmin/phpmyadmin/commit/3c96596f7d897e048be4c2c85d94... Author: Marc Delisle marc@infomarc.info Date: 2013-06-05 (Wed, 05 Jun 2013)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.0.3 release
Commit: bad0352e0382fc5df7013298849918dea3e6eae6 https://github.com/phpmyadmin/phpmyadmin/commit/bad0352e0382fc5df70132988499... Author: Marc Delisle marc@infomarc.info Date: 2013-06-05 (Wed, 05 Jun 2013)
Log Message: ----------- Merge branch 'MAINT_4_0_3' into QA_4_0
Commit: 773c5312d99ae761708fd2b24c652029a9d0f39a https://github.com/phpmyadmin/phpmyadmin/commit/773c5312d99ae761708fd2b24c65... Author: Marc Delisle marc@infomarc.info Date: 2013-06-05 (Wed, 05 Jun 2013)
Changed paths: M ChangeLog
Log Message: ----------- Fix merge conflict
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/77330abaef0e...773c5312d99a