From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 11 Jun 2015 02:29:33 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_38~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60acbf319a83ba920ed2130bf0d831475c3e331f;p=thirdparty%2Fntp.git

merge cleanup

bk: 5578f28dog-uaWVuwek1ygOF25jiPA
---

diff --git a/ChangeLog b/ChangeLog
index 62223bb2a..b80ba87b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p3:
+* [Bug 2778] Implement "apeers"  ntpq command to include associd.
 (4.3.37) 2015/06/08 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey