fixed wrong changelog merge
Merge branch 'master' into ejhernandez/promote-demote-ha

Conflicts:
	main/core/ChangeLog
Merge branch 'master' into ejhernandez/promote-demote-ha

Conflicts:
	main/core/ChangeLog
Do not depend on roundcube-plugins-openchange
Merge pull request #939 from Zentyal/ejhernandez/promote-demote-ha

Add Promote/Demote HA feature
Merge branch 'master' into ejhernandez/ha-auth

Conflicts:
	main/core/ChangeLog