Merge bk://bk.ntp.org/ntp-stable

into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2671

bk: 54aced62iLVwWDdk8TxrXBWUL5lNYg

diff --cc ChangeLog
index 441dc7bcf98fe9350da2bcc46b17934ea75c2cb9,f7b394557603b9edc080388b81f4ded21b1712fe..4a11b1044231e9e3b67718afd95c86352791ba52
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,19 +1,22 @@@
  ---
 -* [Bug 2695] Windows build: __func__ not supported under Windows.
 +
 +* [Sec 2671] vallen in extension fields are not validated.
 +---
+ (4.2.8p1-beta5) 2015/01/07 Released by Harlan Stenn <stenn@ntp.org>
+ 
++* [Bug 2695] Windows build: __func__ not supported under Windows.
+ * [Bug 2728] Work around C99-style structure initialization code
+   for older compilers, specifically Visual Studio prior to VS2013.
 -* Fix a regression introduced to timepps-Solaris.h as part of:
 -  [Bug 1206] Required compiler changes for Windows
 -  (4.2.5p181) 2009/06/06
+ ---
+ (4.2.8p1-beta4) 2015/01/04 Released by Harlan Stenn <stenn@ntp.org>
+ 
+ * [Bug 1084] PPSAPI for ntpd on Windows with DLL backends
+ * [Bug 2695] Build problem on Windows (sys/socket.h).
+ * [Bug 2715] mdnstries option for ntp.conf from NetBSD.
++* Fix a regression introduced to timepps-Solaris.h as part of:
++  [Bug 1206] Required compiler changes for Windows
++  (4.2.5p181) 2009/06/06
+ ---
  (4.2.8p1-beta3) 2015/01/02 Released by Harlan Stenn <stenn@ntp.org>
  
  * [Bug 2627] shm refclock allows only two units with owner-only access