]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Merge branch 'isc-master' into changes
authorAndrei Pavel <andrei.pavel@qualitance.com>
Fri, 8 Jul 2016 08:51:06 +0000 (11:51 +0300)
committerAndrei Pavel <andrei.pavel@qualitance.com>
Fri, 8 Jul 2016 08:51:06 +0000 (11:51 +0300)
1  2 
src/bin/dhcp6/dhcp6_srv.cc
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc

Simple merge