modified:   local/httpd-vufind.conf
Merge branch 'development' of github.com:swissbib/sbvf2 into development

Conflicts:
	local/httpd-vufind.conf

	deleted:    local/httpd-vufind.conf
Merge branch 'development' of github.com:swissbib/sbvf2 into development