merge cleanup

bk: 558f2585he59Mdt1YJnf_5pS3kjD8Q

diff --git a/ChangeLog b/ChangeLog
index 439b64c78c49ea3f5c8f1b48cfb71dd516b81d62..2928c4f7aee8673cdb74d060714d017038118541 100644 (file)
--- 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.