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

into  psp-deb1.ntp.org:/home/stenn/ntp-stable-2776

bk: 553df508maDEqmphS0qIAZQeAUgRxA

diff --cc ChangeLog
index 8814f355bfd233d4a4ff7a5419ce0a46407e92ec,91ac1c7acf3a99688fd0a4500eaf31cb97c6e752..1a6ac4fb6ed52e9601f27a7ac5ad98e4250650b3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,8 @@@
  ---
  
+ * CID 1269537: Clean up a line of dead code in getShmTime().
 +* CID 1295478: Quiet a pedantic potential error from the fix for Bug 2776.
 +* [Bug 2776] Improve ntpq's 'help keytype'.
  * [Bug 2794] Clean up kernel clock status reports.
  * [Bug 2800] refclock_true.c true_debug() can't open debug log because
    of incompatible open/fdopen parameters.
@@@ -9,8 -8,9 +10,10 @@@
  * [Bug 2808] GPSD_JSON driver enhancements, step 1.
    Various improvements, see http://bugs.ntp.org/2808 for details.
    Changed libjsmn to a more recent version.
+ * [Bug 2813] HP-UX needs -D__STDC_VERSION__=199901L and limits.h.
  * Improve the ntpq documentation around the controlkey keyid.
 +* ntpq.c cleanup.
+ * autogen-5.18.5
  ---
  (4.2.8p2) 2015/04/07 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.8p2-RC3) 2015/04/03 Released by Harlan Stenn <stenn@ntp.org>