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

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

bk: 568f48c8Q0L0UAuvJ-iE0PgehMXa1A

diff --cc ChangeLog
index 1d07af5275de79040ec7769fca30b623c3c5d828,304bd85ab7dc7c851bbe3b0704766c8fed26ba78..bd30a292eacdb0566cfae60b2d129a8be7563c03
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,6 +1,9 @@@
  ---
+ (4.2.8p5) 2016/01/07 Released by Harlan Stenn <stenn@ntp.org>
  
 +* [Sec 2937] ntpq: nextvar() missing length check. perlinger@ntp.org
 +---
 +
  * [Sec 2956] small-step/big-step.  Close the panic gate earlier.  HStenn.
  * CID 1339955: Free allocated memory in caljulian test.  HStenn.
  * CID 1339962: Explicitly initialize variable in caljulian test.  HStenn.