From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 2 Dec 2015 09:59:38 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_85~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1ccf9bf144a6840510d592ea00e74b8abe26495;p=thirdparty%2Fntp.git

merge cleanup

bk: 565ec10aN44-S1_ilOrkYb-_M_5DpA
---

diff --git a/ChangeLog b/ChangeLog
index 8994a0338..a1d6015f9 100644
--- 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.