From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 25 Jun 2015 05:16:06 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38e976db29c98ee2470ba8060a7a6e3dcf201c66;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-2853

bk: 558b8e96Hrl2Zb2PY1rJ3NiCjwBQ2g
---

38e976db29c98ee2470ba8060a7a6e3dcf201c66
diff --cc ChangeLog
index e04a36380,21876d677..d34721439
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,8 @@@
  ---
+ 
 +* [Sec 2853] FICORA #829967.  Juergen Perlinger, Harlan Stenn.
 +* [Sec 2853] Initial work on tests/sec-2853/.  Harlan Stenn.
- 
+ * [Bug 2855] Parser fix for conditional leap smear code.  Harlan Stenn.
  ---
  (4.2.8p3-RC2) 2015/06/24 Released by Harlan Stenn <stenn@ntp.org>