[master] Finished merge of trac4070 (option tuple)

diff --git a/ChangeLog b/ChangeLog
index 64ba155bc946a47f4d7ee6adac11f4e6f489f848..64db961d46e4752ade9e527346ab4d4ef76ee76e 100644 (file)
--- 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)