merge cleanup

bk: 55b74e5eZUdEaKJg2Y8zim9r-gSKsA

diff --git a/ChangeLog b/ChangeLog
index f9be3459f7f53189ab82afad3fb36f2352193abe..eb4430f63dd817726ef1b84e5f34fd739f9f3ee9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p4:
+* Typo fix for GCC warning suppression.  Harlan Stenn.
 (4.3.65) 2015/07/27 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * [Bug 2595] ntpdate man page quirks.  Hal Murray, Harlan Stenn.