]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac3589'
authorMarcin Siodelski <marcin@isc.org>
Wed, 15 Oct 2014 12:34:30 +0000 (14:34 +0200)
committerMarcin Siodelski <marcin@isc.org>
Wed, 15 Oct 2014 12:34:30 +0000 (14:34 +0200)
1  2 
src/bin/dhcp4/dhcp4_srv.cc
src/bin/dhcp6/dhcp6_srv.cc
src/lib/dhcp/tests/pkt6_unittest.cc

Simple merge
Simple merge
Simple merge