From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 27 Jun 2015 22:36:53 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_48~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be75be29611362f86fa9038ec940a054b73b6f68;p=thirdparty%2Fntp.git

merge cleanup

bk: 558f2585he59Mdt1YJnf_5pS3kjD8Q
---

diff --git a/ChangeLog b/ChangeLog
index 439b64c78..2928c4f7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Below are from 4.2.8p3:
+* [Bug 1060] Buffer overruns in libparse/clk_rawdcf.c.  Helge Oldach.
+* [Bug 2859] Improve raw DCF77 robustness deconding.  Frank Kardel.
 (4.3.47) 2015/06/27 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * [Bug 2855] Report leap smear in the REFID.  Harlan Stenn.