merge cleanup

bk: 56977bfdkMqZN3tvC1UjFa1Al-QvTA

diff --git a/ChangeLog b/ChangeLog
index 64108981f9949c4469abd28a4a27b330a649152e..54074d6649a9b7344a30f737916e843430bdf57c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,7 +39,6 @@
 * [Bug 2829] Look at pipe_fds in ntpd.c  (did so. perlinger@ntp.org)
 * [Bug 2887] stratum -1 config results as showing value 99
   - fudge stratum should only accept values [0..16]. perlinger@ntp.org
-  - fudge stratum only accepts values [0..16]. perlinger@ntp.org
 * [Bug 2932] Update leapsecond file info in miscopt.html.  CWoodbury, HStenn.
 * [Bug 2934] tests/ntpd/t-ntp_scanner.c has a magic constant wired in.  HMurray
 * [Bug 2944] errno is not preserved properly in ntpdate after sendto call.