From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 7 Jun 2015 06:31:47 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_36~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=995f9bdc7c64ac5384c4aae30125c8c26516fac6;p=thirdparty%2Fntp.git

merge cleanup

bk: 5573e553yx-v9-CdjgieBX__MAumOQ
---

diff --git a/ChangeLog b/ChangeLog
index 68bee52b4..f4549f3a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Below are from 4.2.8p3:
 * [Bug 2836] DFC77 patches from Frank Kardel to make decoding more
   robust, and require 2 consecutive timestamps to be consistent.
+* [Bug 2842] Bug in mdoc2man.
 (4.3.35) 2015/06/05 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