Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 87a56db0a702a23b494d80740cbf80def6a2c647 https://github.com/phpmyadmin/phpmyadmin/commit/87a56db0a702a23b494d80740cbf... Author: Marc Delisle <marc@infomarc.info> Date: 2012-12-13 (Thu, 13 Dec 2012) Changed paths: M Documentation.html M README M libraries/Config.class.php Log Message: ----------- 3.5.5-rc1 Commit: 9ac9172ba76e321c1decbc1ccab54d8308159087 https://github.com/phpmyadmin/phpmyadmin/commit/9ac9172ba76e321c1decbc1ccab5... Author: Marc Delisle <marc@infomarc.info> Date: 2012-12-13 (Thu, 13 Dec 2012) Log Message: ----------- Merge branch 'MAINT_3_5_5' into QA_3_5 Commit: 3bca12a607a40b961c42d51b079e36a64de811a1 https://github.com/phpmyadmin/phpmyadmin/commit/3bca12a607a40b961c42d51b079e... Author: Marc Delisle <marc@infomarc.info> Date: 2012-12-13 (Thu, 13 Dec 2012) Changed paths: M ChangeLog M Documentation.html M README M libraries/Config.class.php Log Message: ----------- 3.5.6-dev Commit: ba45245bf9051397d95e1d925c859b1ea9967236 https://github.com/phpmyadmin/phpmyadmin/commit/ba45245bf9051397d95e1d925c85... Author: Marc Delisle <marc@infomarc.info> Date: 2012-12-13 (Thu, 13 Dec 2012) Log Message: ----------- Merge branch 'QA_3_5' Commit: 8428d7d55055cae5ca5f1d0ea493d11e44dac682 https://github.com/phpmyadmin/phpmyadmin/commit/8428d7d55055cae5ca5f1d0ea493... Author: Marc Delisle <marc@infomarc.info> Date: 2012-12-13 (Thu, 13 Dec 2012) Changed paths: M ChangeLog Log Message: ----------- Fix merge conflicts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/23dceebc6a42...8428d7d55055