merge cleanup

bk: 5656a69c6ZZbusn8HwKfZqKnzwmIfw

diff --git a/ChangeLog b/ChangeLog
index f006487fb277de3c3f9fd208d473bc55d5922c56..05785e46644a6877ce5b3568b4e3b59c0b2e003d 100644 (file)
--- 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.