Branch: refs/heads/QA_4_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: ad54449d105365dbbd39ae879306f1037fe238cd https://github.com/phpmyadmin/phpmyadmin/commit/ad54449d105365dbbd39ae879306... Author: Marc Delisle marc@infomarc.info Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.0.4.2 release
Commit: f5136aea9ec3910e09df477683644f6212baa89a https://github.com/phpmyadmin/phpmyadmin/commit/f5136aea9ec3910e09df47768364... Author: Marc Delisle marc@infomarc.info Date: 2013-07-28 (Sun, 28 Jul 2013)
Log Message: ----------- Merge branch 'MAINT_4_0_4' into QA_4_0
Commit: af5ca358d2e21422f7af1b8054ac6ed5d071ab4f https://github.com/phpmyadmin/phpmyadmin/commit/af5ca358d2e21422f7af1b8054ac... Author: Marc Delisle marc@infomarc.info Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths: M ChangeLog
Log Message: ----------- Fix merge conflicts
Commit: 0e9e7f28a21eb352f6d85db84c4d5a8a397ad26e https://github.com/phpmyadmin/phpmyadmin/commit/0e9e7f28a21eb352f6d85db84c4d... Author: Marc Delisle marc@infomarc.info Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths: M ChangeLog
Log Message: ----------- Fix merge conflicts
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/836529be425c...0e9e7f28a21e