From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 13 Jun 2015 09:03:16 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_40~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3aa000ece9b1ac11c30053fc982208f9e19ea72;p=thirdparty%2Fntp.git

merge cleanup

bk: 557bf1d4IFDzsHDXvWDxOrLyai8X4Q
---

diff --git a/ChangeLog b/ChangeLog
index 932c4292f..06231fef9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p3:
+* Unity test framework
 (4.3.39) 2015/06/12 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * [Bug 2843] make check fails on 4.3.36