From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 26 Nov 2015 06:28:44 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_84~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3db46abe46b21b514d6e69ea842a2f9111544371;p=thirdparty%2Fntp.git

merge cleanup

bk: 5656a69c6ZZbusn8HwKfZqKnzwmIfw
---

diff --git a/ChangeLog b/ChangeLog
index f006487fb..05785e466 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p5:
+* Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.
 (4.3.83) 2015/11/25 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p5:
 * Unity test cleanup.  Harlan Stenn.