[master] Finished merge of trac4106 (DHCPv4-over-DHCPv6 IPC)

diff --git a/ChangeLog b/ChangeLog
index e2e42e45d267818bcb7850aaad4742e36268acaa..ab720ca42c09c35a6670a51fe88d8ef18c2448b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1125.  [func]          fdupont
+       Inter-process communication for exchanging packets between
+       DHCPv4 and DHCPv6 components of DHCPv4-over-DHCPv6 has been
+       implemented.
+       (Trac #4106, git xxx)
+
 1124.  [bug]           sar
        Update the classification document to match the output from
        the debug statements.