Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2e627b9ae575f481f0b24574528aa212e60cf356 https://github.com/phpmyadmin/phpmyadmin/commit/2e627b9ae575f481f0b24574528a... Author: Marc Delisle marc@infomarc.info Date: 2013-01-28 (Mon, 28 Jan 2013)
Changed paths: M ChangeLog M Documentation.html M README M libraries/Config.class.php
Log Message: ----------- 3.5.6 release
Commit: 9727db86472f0de709f3cf9d83114516905407bf https://github.com/phpmyadmin/phpmyadmin/commit/9727db86472f0de709f3cf9d8311... Author: Marc Delisle marc@infomarc.info Date: 2013-01-28 (Mon, 28 Jan 2013)
Log Message: ----------- Merge branch 'MAINT_3_5_6' into QA_3_5
Commit: 360a9f4a0c3df7650dafad2199a8022935101182 https://github.com/phpmyadmin/phpmyadmin/commit/360a9f4a0c3df7650dafad2199a8... Author: Marc Delisle marc@infomarc.info Date: 2013-01-28 (Mon, 28 Jan 2013)
Changed paths: M ChangeLog
Log Message: ----------- Fix merge conflict
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cf067f33a9ec...360a9f4a0c3d
-
Marc Delisle