From 30102cacee95b91e6c4666f0c11f06232f19eeb9 Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Tue, 18 Apr 2017 07:25:58 +0200
Subject: [master] Finished merge of trac4070 (option tuple)

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

diff --git a/ChangeLog b/ChangeLog
index 64ba155bc9..64db961d46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1241.	[func]		fdupont
+	Support for tuple-based options added. DHCPv6 option
+	bootfile-param (code 60) can now be set in a more convenient
+	manner.
+	(Trac #4070, git xxx)
+
 1240.	[bug]		marcin
 	Corrected IOFetch unit test failures on Debian.
 	(Trac #5216, git a7c2946678c43aedfb2e3c37b9730a10067528f3)
-- 
cgit v1.2.3