]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[2681] Merge branch 'master' into trac2681
authorStephen Morris <stephen@isc.org>
Tue, 12 Feb 2013 12:28:02 +0000 (12:28 +0000)
committerStephen Morris <stephen@isc.org>
Tue, 12 Feb 2013 12:28:02 +0000 (12:28 +0000)
Conflicts:
src/lib/dhcpsrv/alloc_engine.cc

1  2 
src/bin/dhcp4/dhcp4_srv.cc
src/bin/dhcp6/dhcp6_srv.cc

Simple merge
Simple merge