Merge psp-deb1.ntp.org:ntp-stable

into  pogo.udel.edu:/pogo/users/murray/bug-2700

bk: 54a7494fczVBso5QnSSYoj4m6sImhA

diff --cc ChangeLog
index a7cda50fe99ae95c46da7da372bc5011f04f3a2a,f380ebbcd28c1f9fc493b2614ad3f52a73eb5fc7..52720d607bd19db98a9fc4a844d3ea354abf7522
--- 1/ChangeLog
--- 2/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>
  

diff --cc ntpd/ntp_control.c
Simple merge