From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 2 Jul 2015 09:39:56 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_51~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03dcab2deeb6d4be7b52e4ea693e3f7b299aad24;p=thirdparty%2Fntp.git

merge cleanup

bk: 559506ecdf1SDeJujK8g12XLCAGpMA
---

diff --git a/ChangeLog b/ChangeLog
index 0b6311ed3..2a7b8728c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
+Below are from 4.2.8p4:
+* [Bug 2864] 4.2.8p3 fails to compile on Windows. Juergen Perlinger
+* [Bug 2867] ntpd with autokey active crashed by 'ntpq -crv'. J.Perlinger
 (4.3.50) 2015/07/01 Released by Harlan Stenn <stenn@ntp.org>
+* internal infrastructure update.
 (4.3.49) 2015/06/30 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * [Bug 2846] Report 'unsynchronized' status during the leap second.