]> git.ipfire.org Git - thirdparty/kea.git/commit
Merge branch 'master' of ssh://git.kea.isc.org/git/kea
authorTomek Mrugalski <tomasz@isc.org>
Wed, 26 Apr 2017 15:07:27 +0000 (17:07 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Wed, 26 Apr 2017 15:07:27 +0000 (17:07 +0200)
commit2a89ec50e403697d1ff2d551cf55549efaeae2fc
tree8600d3044444f8538b4ab5ee56a4ba0fe944c4e0
parent482925df157fb1c559257f8b10db5b8e6113c788
parent3e6e2246433cf45339b887b23107715089a02f19
Merge branch 'master' of ssh://git.kea.isc.org/git/kea

# Conflicts:
# ChangeLog
ChangeLog