From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 25 Jun 2015 04:17:46 +0000 (-0400)
Subject: Merge cleanup
X-Git-Tag: NTP_4_3_46~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da63e6df189da6787ee8cba80743c4c715cfc45a;p=thirdparty%2Fntp.git

Merge cleanup

bk: 558b80eaeJfUm8nfReNr8rwwF59Qfw
---

diff --git a/ChangeLog b/ChangeLog
index d5f2caa9b..cda07e727 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p3:
+* [Bug 2855] Parser fix for conditional leap smear code.  Harlan Stenn.
 (4.3.45) 2015/06/24 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * [Bug 2855] Implement conditional leap smear code.  Martin Burnicki.