Vitezslav Kriz authored Jun 21, 2016 and Vitezslav Kriz committed Jul 08, 2016

Conflicts:
	src/knot/conf/scheme.c
	src/knot/conf/scheme.h
	src/knot/nameserver/axfr.c
	src/knot/nameserver/axfr.h
	src/knot/zone/semantic-check.c
	src/libknot/rrset.c
	tests-extra/tools/dnstest/server.py