]> git.ipfire.org Git - thirdparty/kea.git/commit
Merge branch 'master' into v1_4_0
authorWlodek Wencel <wlodek@isc.org>
Thu, 14 Jun 2018 17:16:47 +0000 (19:16 +0200)
committerWlodek Wencel <wlodek@isc.org>
Thu, 14 Jun 2018 17:16:47 +0000 (19:16 +0200)
commit1578e3ea4b17714fb6626a28ed862dd9fdd6b9cf
treeebf2072329252c3166fe2a7d7675c94e601475af
parente866b87de7deede181dd283c101eab6418dce747
parent6a20e59ac72942f83fcb347b5f82b3508c2890a6
Merge branch 'master' into v1_4_0

Conflicts:
configure.ac
configure.ac