]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac2701'
authorMarcin Siodelski <marcin@isc.org>
Thu, 7 Mar 2013 09:22:45 +0000 (10:22 +0100)
committerMarcin Siodelski <marcin@isc.org>
Thu, 7 Mar 2013 09:22:45 +0000 (10:22 +0100)
1  2 
src/lib/dhcp/option_definition.h
src/lib/dhcpsrv/subnet.h

Simple merge
Simple merge