From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 5 Jan 2016 12:35:52 +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=ec5577d8773200908a731ffce22d3ef5c68d1241;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: 568bb8a8YcT4J8VYQOzk6G0sTtnKmA
---

ec5577d8773200908a731ffce22d3ef5c68d1241
diff --cc ChangeLog
index 118a0ce7e,36ecb6c7c..14574f267
--- a/ChangeLog
+++ b/ChangeLog
@@@ -54,7 -52,9 +55,8 @@@
  * Header cleanup in tests/sandbox/uglydate.c.  Harlan Stenn.
  * Header cleanup in tests/libntp/sfptostr.c.  Harlan Stenn.
  * Quiet a warning from clang.  Harlan Stenn.
+ * Update the NEWS file.  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