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