Merge psp-deb1.ntp.org:/home/stenn/ntp-stable

into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-2627

bk: 54a74e8fXW8GsaFZ0g2ewfID6cRy4g

diff --cc ChangeLog
index 52720d607bd19db98a9fc4a844d3ea354abf7522,c8b434a8f3e7a2f2db551e04a595770b0a8c2736..dee3be68ec3e312a37e9cd884f7d8ef9ee337654
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,7 +1,15 @@@
  ---
 -  always private
 +
+ * [Bug 2627] shm refclock allows only two units with owner-only access
+   Use mode bit 0 to select public access for units >= 2 (units 0 & 1 are
++  always private.
 +* [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_leapsec.c
Simple merge