Merge tag 'v1.5.3'

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

Tue, 23 Jan 2018 15:05:17 +0000 (16:05 +0100)

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

Tue, 23 Jan 2018 15:05:17 +0000 (16:05 +0100)
author Vladimír Čunát <vladimir.cunat@nic.cz>
Tue, 23 Jan 2018 15:05:17 +0000 (16:05 +0100)
committer Vladimír Čunát <vladimir.cunat@nic.cz>
Tue, 23 Jan 2018 15:05:17 +0000 (16:05 +0100)
diff --cc config.mk
Simple merge
diff --cc daemon/engine.h
Simple merge
author	Vladimír Čunát <vladimir.cunat@nic.cz>
	Tue, 23 Jan 2018 15:05:17 +0000 (16:05 +0100)
committer	Vladimír Čunát <vladimir.cunat@nic.cz>
	Tue, 23 Jan 2018 15:05:17 +0000 (16:05 +0100)
		1	2
config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
daemon/engine.h	patch \|	diff1 \|	diff2 \|	blob \| history