From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 23 Nov 2015 11:02:09 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_82~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48724cbe74e60864593c6f1600bb5ace05d86f90;p=thirdparty%2Fntp.git

merge cleanup

bk: 5652f231qahFKvd2XtdBWskCA3GEiA
---

diff --git a/ChangeLog b/ChangeLog
index 2eed5bbc0..87d238088 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Below are from 4.2.8p5:
+* CID 1339955: Free allocated memory in caljulian test.  HStenn.
+* CID 1339962: Explicitly initialize variable in caljulian test.  HStenn.
 (4.3.81) 2015/11/21 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p5:
 * Unity test cleanup.  Harlan Stenn.