merge cleanup

bk: 55b5b0687DsVxbKTwEJnDcPrwwQKkQ

diff --git a/ChangeLog b/ChangeLog
index 134c92796b1e7f9a726fa650066905668fb2e07e..8c3a2891a6759638078295756ea115d31dd9639b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 Below are from 4.2.8p4:
+* [Bug 2595] ntpdate man page quirks.  Hal Murray, Harlan Stenn.
 * [Bug 2625] Deprecate flag1 in local refclock.  Hal Murray, Harlan Stenn.
 * [Bug 2817] Stop locking ntpd into memory by default under Linux.  H.Stenn.
 * Wrote tests for ntpd/ntp_prio_q.c. Tomasz Flendrich