Merge branch 'master' into cache-aggr-wip

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

Tue, 30 Jan 2018 13:05:58 +0000 (14:05 +0100)

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

Tue, 30 Jan 2018 13:05:58 +0000 (14:05 +0100)
author Vladimír Čunát <vladimir.cunat@nic.cz>
Tue, 30 Jan 2018 13:05:58 +0000 (14:05 +0100)
committer Vladimír Čunát <vladimir.cunat@nic.cz>
Tue, 30 Jan 2018 13:05:58 +0000 (14:05 +0100)
diff --cc config.mk
Simple merge
diff --cc daemon/README.rst
Simple merge
diff --cc lib/utils.c
Simple merge
author	Vladimír Čunát <vladimir.cunat@nic.cz>
	Tue, 30 Jan 2018 13:05:58 +0000 (14:05 +0100)
committer	Vladimír Čunát <vladimir.cunat@nic.cz>
	Tue, 30 Jan 2018 13:05:58 +0000 (14:05 +0100)
		1	2
config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
daemon/README.rst	patch \|	diff1 \|	diff2 \|	blob \| history
lib/utils.c	patch \|	diff1 \|	diff2 \|	blob \| history