[master] Finished merge of trac4106_update (DHCP4o6 IPC)

diff --git a/ChangeLog b/ChangeLog
index 8c697d40eb8086a330d2d7d1e341cb63c06eb3f0..ea536299182ba6991b10dd37259c14cabb436d2b 100644 (file)
--- 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,