Conflicts:
	src/knotc.8
	src/libknot/nameserver/name-server.c
	src/libknot/rdata.c
	src/libknot/zone/zone-diff.c