Conflicts:
	contrib/openldap/template-fd.schema
	include/class_plugin.inc
	plugins/admin/groups/class_group.inc
	plugins/admin/ogroups/objectSelect/selectObject-filter.xml
	plugins/admin/users/user-list.xml
	plugins/personal/generic/class_user.inc
	plugins/personal/posix/class_posixAccount.inc
	plugins/personal/posix/trustSelect/trust-filter.xml