From b3eda594e055f03a9a601bacf0c72c3db0ef8e3c Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Tue, 5 Jul 2016 09:51:51 +0200
Subject: [PATCH] [master] Finished merge of trac4274 (DHCP4o6 developer doc)

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

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)
-- 
2.47.2