From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 7 Jan 2016 06:35:54 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable-p5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b63a3237284436e035e679d07b81b94a889c6c73;p=thirdparty%2Fntp.git

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: 568e074aUEXJyP1Fm1uQoqjKgqoDPg
---

b63a3237284436e035e679d07b81b94a889c6c73
diff --cc ChangeLog
index 14574f267,586196c20..1d07af527
--- a/ChangeLog
+++ b/ChangeLog
@@@ -56,7 -53,9 +56,8 @@@
  * Header cleanup in tests/libntp/sfptostr.c.  Harlan Stenn.
  * Quiet a warning from clang.  Harlan Stenn.
  * Update the NEWS file.  Harlan Stenn.
+ * Update scripts/calc_tickadj/Makefile.am.  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