Merge cleanup

bk: 558b80eaeJfUm8nfReNr8rwwF59Qfw

diff --git a/ChangeLog b/ChangeLog
index d5f2caa9bca57111b1ddaf3631007314e9faea59..cda07e72745445ce8441279ce207bcbb1e562a04 100644 (file)
--- 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.