From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 28 Jul 2015 09:41:50 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_66~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cd65d48d4c53da631880ecbf8c26700b60c1781;p=thirdparty%2Fntp.git

merge cleanup

bk: 55b74e5eZUdEaKJg2Y8zim9r-gSKsA
---

diff --git a/ChangeLog b/ChangeLog
index f9be3459f..eb4430f63 100644
--- 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.