From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 1 Jul 2016 12:22:36 +0000 (+0200)
Subject: [master] ChangeLog updated.
X-Git-Tag: trac4245_base~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=383d824ddc7764a664d693c75458ae67b4c55f83;p=thirdparty%2Fkea.git

[master] ChangeLog updated.
---

diff --git a/ChangeLog b/ChangeLog
index 707ce04cbb..056c679771 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1136.	[doc]		tomek
+	Included full text of MPL 2.0 and Apache licenses.
+	(Trac #4529, git baefb4b3e2078a0a0f794b42ef52d6b7d53c9dab)
+
 1135.	[func]		fdupont
 	Integrated the DHCPv4 service part of DHCPv4-ouver-DHCPv6 support.
 	(Trac #4110, git 7d36aebe14db10b0cbac8e6c0e82160b9d5d7ecd)