From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 10 Mar 2015 12:06:55 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_8~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a4ce5d74f6258226aedcf35efc787e7ea481fa4;p=thirdparty%2Fntp.git

merge cleanup

bk: 54fede5fGWTVcbB_VvblP6aDzIPZvg
---

diff --git a/ChangeLog b/ChangeLog
index 223c0a296..697c6c473 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p2:
+* [Bug 2774] Unreasonably verbose printout - leap pending/warning
 (4.3.7) 2015/03/07 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2784] Fix for 2782 uses clock_gettime() instead of time().
 (4.3.6) 2015/03/06 Released by Harlan Stenn <stenn@ntp.org>