From dcd65feebe9c53129fde3e81b10c60eaebf5b06d Mon Sep 17 00:00:00 2001
From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 20 Jun 2015 19:52:38 -0400
Subject: [PATCH] merge cleanup

bk: 5585fcc6WnTXdgrHokB-gc1aRA8kNw
---
 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6f53dbae4..6a8124df7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Below are from 4.2.8p3:
+* [Bug 2852] 'make check' can't find unity.h.  Hal Murray.
+* [Bug 2854] Missing brace in libntp/strdup.c.  Masanari Iida.
+* Unity cleanup.
 (4.3.42) 2015/06/17 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * Unity cleanup.
-- 
2.47.3