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

merge cleanup

bk: 5573b897pWAZsN-eIe93uog8QDugcw
---

diff --git a/ChangeLog b/ChangeLog
index b923519bb..be8b91f95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+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.
 (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