del
Merge branch 'master' of github.com:Zeitschriftendatenbank/zdb-vufind

Conflicts:
	web/conf/config.ini
13.02