Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5ff7adb3989bca9278e8adfe9324f59d168902b2 https://github.com/phpmyadmin/phpmyadmin/commit/5ff7adb3989bca9278e8adfe9324... Author: Marc Delisle marc@infomarc.info Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths: M ChangeLog M Documentation.html M README M libraries/Config.class.php
Log Message: ----------- 3.5.1 release
Commit: 763dca17adc2733f8fb77138d3e3f050d1c02d65 https://github.com/phpmyadmin/phpmyadmin/commit/763dca17adc2733f8fb77138d3e3... Author: Marc Delisle marc@infomarc.info Date: 2012-05-03 (Thu, 03 May 2012)
Log Message: ----------- Merge branch 'MAINT_3_5_1' into QA_3_5
Commit: d212e1a3ea0ae73f8305db24b386daae0d3ff58e https://github.com/phpmyadmin/phpmyadmin/commit/d212e1a3ea0ae73f8305db24b386... Author: Marc Delisle marc@infomarc.info Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths: M ChangeLog
Log Message: ----------- Fix merge conflicts
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/54f8a82...d212e1a