]> git.ipfire.org Git - thirdparty/kea.git/commit
Merge branch 'master' into v1_3_0
authorWlodek Wencel <wlodek@isc.org>
Tue, 24 Oct 2017 21:59:04 +0000 (23:59 +0200)
committerWlodek Wencel <wlodek@isc.org>
Tue, 24 Oct 2017 21:59:04 +0000 (23:59 +0200)
commitf6c3041b783ff8f285ae98d00a936d3e0ead966c
treed319a82fd88c33e29e87921408e314c8ced9a002
parent541d685cd99e08e49ca2779d13cf3c79a7ed9cab
parent84fc6638b056758a186154231a02547a37e678ee
Merge branch 'master' into v1_3_0

Conflicts:
configure.ac
configure.ac