merge cleanup

bk: 55a342cfFwkkUesaIucf0Hx1n5LzRw

diff --git a/ChangeLog b/ChangeLog
index ada140296cbd08bec812a9ca6ec912e717743621..82471f53d2c00666046b09299ca2af106adaba16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Below are from 4.2.8p4:
+* [Bug 2823] ntpsweep with recursive peers option doesn't work.  H.Stenn.
+* scripts/lib/NTP/Util.pm: stratum output is version-dependent.  Harlan Stenn.
 (4.3.58) 2015/07/12 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * [Bug 2875] sntp/Makefile.am: Get rid of DIST_SUBDIRS.  libevent must