Conflicts:
	src/knot/main.c
	src/knot/server/notify.c
	src/knot/server/xfr-handler.c
	src/knot/server/zone-load.c
	src/knot/server/zones.c
	src/libknot/nameserver/name-server.c
	src/libknot/packet/packet.c
	src/libknot/updates/xfr-in.c