Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fe1d3ce9ba41027227c23103c3021c7fd463188b https://github.com/phpmyadmin/phpmyadmin/commit/fe1d3ce9ba41027227c23103c302... Author: Marc Delisle <marc@infomarc.info> Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.5.1-dev Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 6f970ce532816e5fde49c17b7ff1b5856232dea4 https://github.com/phpmyadmin/phpmyadmin/commit/6f970ce532816e5fde49c17b7ff1... Author: Marc Delisle <marc@infomarc.info> Date: 2015-09-09 (Wed, 09 Sep 2015) Log Message: ----------- Merge branch 'QA_4_5' Commit: e61d5a905553316c2e57774b11fafff0bbd55650 https://github.com/phpmyadmin/phpmyadmin/commit/e61d5a905553316c2e57774b11fa... Author: Marc Delisle <marc@infomarc.info> Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M ChangeLog Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/df9ccac2b57a...e61d5a905553