merge cleanup

bk: 54fede5fGWTVcbB_VvblP6aDzIPZvg

diff --git a/ChangeLog b/ChangeLog
index 223c0a2967ff9ddb6fe6a8579d3249fec1a6be23..697c6c473f3e97f1a24c5bc9c910f2b0c0ea1d56 100644 (file)
--- 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>