[master] Added ChangeLog entry for #5260.

Conflicts:
	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c02f74ede022331f132e3aa5710ecffc6fded4b7..862aebfb534a714ce25acddf7ade2eede9d300d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Kea 1.2.0 released on April 28, 2017
 
+1255.  [bug]           marcin
+       Fixed failing unit tests in libkea-http.
+       (Trac #5260, git 43394f76efb1634155c04b205dec7361fc21f4f9)
+
 1254.  [func]          tomek
        Various improvements needed for upcoming host commands library:
        host data source is now able to delete hosts, hosts can be exported