From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 27 Apr 2015 17:55:44 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_3_25~1^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2254b34543d6108016876521c74a4fcfcdaa5152;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-stable
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2776

bk: 553e78207yeV4vH3z6LBuwKj6HseBQ
---

2254b34543d6108016876521c74a4fcfcdaa5152
diff --cc ChangeLog
index 1a6ac4fb6,cb5e12ab1..51766ae98
--- a/ChangeLog
+++ b/ChangeLog
@@@ -11,8 -9,8 +11,9 @@@
    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.
+ * [Bug 2815] net-snmp before v5.4 has circular library dependencies.
  * 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>