merge cleanup

bk: 5652f231qahFKvd2XtdBWskCA3GEiA

diff --git a/ChangeLog b/ChangeLog
index 2eed5bbc0c291f48a4d2f54d783806dede8bdfc7..87d2380885a50b3379d055162121d6dd5e88d94c 100644 (file)
--- 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.