From: Wlodek Wencel <wlodek@isc.org>
Date: Tue, 24 Oct 2017 21:59:04 +0000 (+0200)
Subject: Merge branch 'master' into v1_3_0
X-Git-Tag: Kea-1.3.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6c3041b783ff8f285ae98d00a936d3e0ead966c;p=thirdparty%2Fkea.git

Merge branch 'master' into v1_3_0

Conflicts:
	configure.ac
---

f6c3041b783ff8f285ae98d00a936d3e0ead966c