From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 16 Jul 2015 07:55:12 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_60~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=914a061914c79a59c1d513dfbc672a027014987f;p=thirdparty%2Fntp.git

merge cleanup

bk: 55a76360iwjaaKNycI8JE9tibILiRA
---

diff --git a/ChangeLog b/ChangeLog
index 0aa3333bd..81b4ecdef 100644
--- 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.