TMP Merge branch 'valid-nxdomain' into cache-aggr-wip

author Vladimír Čunát <vladimir.cunat@nic.cz>

Thu, 18 Jan 2018 16:55:12 +0000 (17:55 +0100)

committer Vladimír Čunát <vladimir.cunat@nic.cz>

Thu, 18 Jan 2018 16:55:12 +0000 (17:55 +0100)
author Vladimír Čunát <vladimir.cunat@nic.cz>
Thu, 18 Jan 2018 16:55:12 +0000 (17:55 +0100)
committer Vladimír Čunát <vladimir.cunat@nic.cz>
Thu, 18 Jan 2018 16:55:12 +0000 (17:55 +0100)
diff --cc daemon/README.rst
Simple merge
diff --cc daemon/bindings.c
Simple merge
diff --cc daemon/engine.c
Simple merge
diff --cc lib/utils.c
Simple merge
author	Vladimír Čunát <vladimir.cunat@nic.cz>
	Thu, 18 Jan 2018 16:55:12 +0000 (17:55 +0100)
committer	Vladimír Čunát <vladimir.cunat@nic.cz>
	Thu, 18 Jan 2018 16:55:12 +0000 (17:55 +0100)
		1	2
daemon/README.rst	patch \|	diff1 \|	diff2 \|	blob \| history
daemon/bindings.c	patch \|	diff1 \|	diff2 \|	blob \| history
daemon/engine.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/utils.c	patch \|	diff1 \|	diff2 \|	blob \| history