]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Merge branch 'isc-master' 27/head
authorAndrei Pavel <andrei.pavel@qualitance.com>
Tue, 5 Jul 2016 12:26:23 +0000 (15:26 +0300)
committerAndrei Pavel <andrei.pavel@qualitance.com>
Tue, 5 Jul 2016 12:26:23 +0000 (15:26 +0300)
1  2 
src/lib/dhcp/dhcp6.h

Simple merge