From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 27 Jul 2015 04:15:36 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_65~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb057ac69db1d5bd2ad593a3d25b12702539793b;p=thirdparty%2Fntp.git

merge cleanup

bk: 55b5b0687DsVxbKTwEJnDcPrwwQKkQ
---

diff --git a/ChangeLog b/ChangeLog
index 134c92796..8c3a2891a 100644
--- 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