[master] Finished merge of trac4274 (DHCP4o6 developer doc)

diff --git a/ChangeLog b/ChangeLog
index 9eea6fdcaf1d67eb98c25f48e9abe7ea370dd5d3..4a336cbcb8b8374a3453a62eb03ce21d93714ef4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1137.  [doc]           fdupont
+       Developer's Guide has been updated with DHCPv4-over-DHCPv6 support
+       details.
+       (Trac #4274, git xxx)
+
 1136.  [doc]           tomek
        Included full text of MPL 2.0 and Apache licenses.
        (Trac #4529, git baefb4b3e2078a0a0f794b42ef52d6b7d53c9dab)