From: Tomek Mrugalski <tomasz@isc.org>
Date: Sat, 14 Oct 2017 21:46:36 +0000 (+0200)
Subject: [master] Commit-id updated after merge.
X-Git-Tag: trac5391_base^2~1
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=26373e694ad520d22cf420702f6950d5580deded;p=thirdparty%2Fkea.git

[master] Commit-id updated after merge.
---

diff --git a/ChangeLog b/ChangeLog
index 19c7ebac96..5e7db98f8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 	Updated Kea Administrator's Manual with the information about
 	new capability of flex-id hook library to use value derived from
 	flexible identifier as a client identifier or DUID.
-	(Trac #5384, git 91e1ff99b4dfb559733cf1189e927c0d98eae581)
+	(Trac #5384, git cce58fee4aa0476712209a7ed92fab587258b49b)
 
 1317.	[bug]		fdupont
 	The kea-admin script now behaves properly when -4 or -6 is missing