From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 16 Sep 2016 08:33:36 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0e322cceab991139147228087319be8d9ba0ba8;p=thirdparty%2Fntp.git

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

bk: 57dbae60bx1DJHkB1RLwuoKp9-m4Xg
---

f0e322cceab991139147228087319be8d9ba0ba8
diff --cc ChangeLog
index 9f35c57af,4810c9bab..5cb3ccfb0
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
  ---
+ * [Bug 2951] ntpd tests fail: multiple definition of `send_via_ntp_signd'
+   - fixed Makefile.am <perlinger@ntp.org>
+ 
++---
 +
 +* [Bug 3053] ntp_loopfilter.c frequency calc precedence error.  Sarah White.
 +* git author attribution cleanup
 +* bk ignore file cleanup
 +
  ---
  (4.2.8p8) 2016/06/02 Released by Harlan Stenn <stenn@ntp.org>