Conflicts:
	Knot.files
	src/Makefile.am
	src/libknot/nameserver/name-server.c
	src/libknot/rdata.c
	src/libknot/updates/xfr-in.c
	src/libknot/util/descriptor.h
	src/libknot/zone/zone-diff.c
	src/zcompile/parser-util.c
	src/zcompile/zparser.y