From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 3 Jan 2015 01:43:43 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:ntp-stable
X-Git-Tag: NTP_4_2_8P1_BETA3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d0152d370dc268327893786f3e6630901989be8;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:ntp-stable
into  pogo.udel.edu:/pogo/users/murray/bug-2700

bk: 54a7494fczVBso5QnSSYoj4m6sImhA
---

7d0152d370dc268327893786f3e6630901989be8
diff --cc ChangeLog
index a7cda50fe,f380ebbcd..52720d607
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,5 +1,12 @@@
  ---
 -* [bug 2700] mrulist stopped working in 4.2.8
 +
 +* [Bug 2681] Fix display of certificate EOValidity dates on 32-bit systems.
 +* [Bug 2695] 4.2.8 does not build on Windows.
++* [bug 2700] mrulist stopped working in 4.2.8.
 +* [Bug 2706] libparse/info_trimble.c build dependencies are broken.
 +* [Bug 2713] variable type/cast, parameter name, general cleanup from NetBSD.
 +* [Bug 2714] libevent may need to be built independently of any build of sntp.
 +* [Bug 2715]  mdnstries option for ntp.conf from NetBSD.
  ---
  (4.2.8p1-beta2) 2014/12/27 Released by Harlan Stenn <stenn@ntp.org>