merge cleanup

bk: 559506ecdf1SDeJujK8g12XLCAGpMA

diff --git a/ChangeLog b/ChangeLog
index 0b6311ed3c465da5bda508404460c52c98066b02..2a7b8728c94e97201e7a23960d944840c20741e1 100644 (file)
--- 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.