merge cleanup

bk: 558acde5quDekSFFjlNbPZ4VwX3vPQ

diff --git a/ChangeLog b/ChangeLog
index 47453567edd6fac516dc0f232935d8f5e542f2bf..eadf886095563b826317231f41b0bb3f5db10c86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Below are from 4.2.8p3:
+* [Bug 2855] Implement conditional leap smear code.  Martin Burnicki.
+* [Bug 2855] leap smear cleanup.  Harlan Stenn.
+* Initial support for experimental leap smear code.  Harlan Stenn.
+* automake-1.15 cleanup for sntp/tests/fileHandlingTest.h.in .  Harlan Stenn.
 (4.3.44) 2015/06/22 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * Initial support for experimental leap smear code.  Harlan Stenn.