Conflicts:
	src/Makefile.am
	src/libknot/rdata.c
	src/libknot/rrset.c
	src/libknot/util/descriptor.h
	src/libknot/zone/zone-contents.c
	src/zcompile/parser-descriptor.c