merge cleanup

bk: 5578f28dog-uaWVuwek1ygOF25jiPA

diff --git a/ChangeLog b/ChangeLog
index 62223bb2a673d309462d43438146c61d7a541d7f..b80ba87b290df796aa91b45b78a28ace23f0a39e 100644 (file)
--- 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