merge cleanup

bk: 5573b897pWAZsN-eIe93uog8QDugcw

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