Merge psp-at1.ntp.org:/home/stenn/ntp-stable-p5

into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-p6

bk: 568bb8a8YcT4J8VYQOzk6G0sTtnKmA

diff --cc ChangeLog
index 118a0ce7eb7af73ce653305041a8157cf496c95f,36ecb6c7c4fc9496c8d1873a48436c03bbafcd74..14574f2673dbca3bcb6ee653bae969a560d68a3f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -54,7 -52,9 +55,8 @@@
  * Header cleanup in tests/sandbox/uglydate.c.  Harlan Stenn.
  * Header cleanup in tests/libntp/sfptostr.c.  Harlan Stenn.
  * Quiet a warning from clang.  Harlan Stenn.
+ * Update the NEWS file.  Harlan Stenn.
  ---
 -(4.2.8p4) 2015/10/21 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.8p4-RC1) 2015/10/06 Released by Harlan Stenn <stenn@ntp.org>
  
  * [Sec 2899] CVE-2014-9297  perlinger@ntp.org