merge cleanup

bk: 5573e553yx-v9-CdjgieBX__MAumOQ

diff --git a/ChangeLog b/ChangeLog
index 68bee52b49571dfa416cba09d6dfff1823db746f..f4549f3a86319b4537ec0bc6017dc70b2811d322 100644 (file)
--- 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