From: Francis Dupont <fdupont@isc.org>
Date: Thu, 16 Jun 2016 18:27:44 +0000 (+0200)
Subject: [master] Finished merge of trac4106_update (DHCP4o6 IPC)
X-Git-Tag: trac4109a_base~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ce1cba00af5d81822d5bbe26ddd28b718f51d54;p=thirdparty%2Fkea.git

[master] Finished merge of trac4106_update (DHCP4o6 IPC)
---

diff --git a/ChangeLog b/ChangeLog
index 8c697d40eb..ea53629918 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1131.	[func]		fdupont
+	Update the DHCPv4-over-DHCPv6 inter-process communication code.
+	(Trac #4106, git xxx)
+
 1130.	[func]		marcin
 	DHCPv6 server assigns DHCP options specified for hosts. Host
 	specific options take precedence over class specific options,