Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cfa87b6835b6b1248ce203b54ce1866cf5ebcc22 https://github.com/phpmyadmin/phpmyadmin/commit/cfa87b6835b6b1248ce203b54ce1... Author: Marc Delisle marc@infomarc.info Date: 2013-05-31 (Fri, 31 May 2013)
Changed paths: M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.0.3-rc1 release
Commit: 4781c3e10585fd27fc5892129288773da4e081fe https://github.com/phpmyadmin/phpmyadmin/commit/4781c3e10585fd27fc5892129288... Author: Marc Delisle marc@infomarc.info Date: 2013-05-31 (Fri, 31 May 2013)
Log Message: ----------- Merge branch 'MAINT_4_0_3' into QA_4_0
Commit: 961515d50b20b9f640bb8f8486b0ee9771ad004d https://github.com/phpmyadmin/phpmyadmin/commit/961515d50b20b9f640bb8f8486b0... Author: Marc Delisle marc@infomarc.info Date: 2013-05-31 (Fri, 31 May 2013)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.0.4-dev
Commit: 9d945e8a0324547b45f93a78410f98d69e056764 https://github.com/phpmyadmin/phpmyadmin/commit/9d945e8a0324547b45f93a78410f... Author: Marc Delisle marc@infomarc.info Date: 2013-05-31 (Fri, 31 May 2013)
Log Message: ----------- Merge branch 'QA_4_0'
Commit: dc65f0c529df22942c3c7190eec788858ac2da65 https://github.com/phpmyadmin/phpmyadmin/commit/dc65f0c529df22942c3c7190eec7... Author: Marc Delisle marc@infomarc.info Date: 2013-05-31 (Fri, 31 May 2013)
Changed paths: M ChangeLog
Log Message: ----------- Fix merge conflict
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/24fc4f5d5377...dc65f0c529df