]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 594dc98 f00e85f)
Merge branch 'trac1138' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac1138
authorDima Volodin <dvv@isc.org>
Tue, 11 Oct 2011 10:53:16 +0000 (06:53 -0400)
committerDima Volodin <dvv@isc.org>
Tue, 11 Oct 2011 10:53:16 +0000 (06:53 -0400)
Conflicts:
src/lib/dns/tests/rdata_dhcid_unittest.cc


Trivial merge
Mirror of https://github.com/isc-projects/kea.git