From: Francis Dupont <fdupont@isc.org>
Date: Tue, 5 Jul 2016 07:51:51 +0000 (+0200)
Subject: [master] Finished merge of trac4274 (DHCP4o6 developer doc)
X-Git-Tag: trac4551_base~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3eda594e055f03a9a601bacf0c72c3db0ef8e3c;p=thirdparty%2Fkea.git

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

diff --git a/ChangeLog b/ChangeLog
index 9eea6fdcaf..4a336cbcb8 100644
--- 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)