merge cleanup

bk: 565ec10aN44-S1_ilOrkYb-_M_5DpA

diff --git a/ChangeLog b/ChangeLog
index 8994a03387368eb9d6fecfa0718b1f9818e2e7da..a1d6015f9feeab820a09fb6f076786a83857707b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p5:
+* [Bug 2829] Look at pipe_fds in ntpd.c  (did so. perlinger@ntp.org)
 (4.3.84) 2015/11/26 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p5:
 * Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.