merge cleanup

bk: 55a76360iwjaaKNycI8JE9tibILiRA

diff --git a/ChangeLog b/ChangeLog
index 0aa3333bd1e1f043b565d18abc409b4ce623975b..81b4ecdef47c3c342189ab063adc2192eea5e3f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p4:
+* Get rid of the NTP_ prefix on our assertion macros.  Harlan Stenn.
 (4.3.59) 2015/07/13 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * [Bug 2823] ntpsweep with recursive peers option doesn't work.  H.Stenn.