From: Marcin Siodelski Date: Tue, 26 Jul 2016 06:12:23 +0000 (+0200) Subject: [github24] Merge remote-tracking branch 'andreipavelQ/master' into github24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6198a4f181774c3f3c410657d0f33f8e0edcb485;p=thirdparty%2Fkea.git [github24] Merge remote-tracking branch 'andreipavelQ/master' into github24 This part of the merge contains replacing "dhcp4" with DHCP4_OPTION_SPACE and "dhcp6" with DHCP6_OPTION_SPACE. --- 6198a4f181774c3f3c410657d0f33f8e0edcb485