From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 2 Apr 2015 03:04:53 +0000 (+0000)
Subject: Merge psp-fb1.ntp.org:/home/stenn/../perlinger/ntp-stable-2797
X-Git-Tag: NTP_4_3_12~3^2~3^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fb567a138364864e3dcb8c689ab9942fc648046;p=thirdparty%2Fntp.git

Merge psp-fb1.ntp.org:/home/stenn/../perlinger/ntp-stable-2797
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-a

bk: 551cb1d5Y5dxcu4T9speeYdamLuRCg
---

4fb567a138364864e3dcb8c689ab9942fc648046
diff --cc ChangeLog
index 411595ce4,361bd7e0a..9b4eba45e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,8 @@@
  ---
+ 
 +* [Bug 2797] ntp-keygen trapped in endless loop for MD5 keys
 +  on big-endian machines
+ * [Bug 2798] sntp should decode and display the leap indicator.
  ---
  (4.2.8p2-RC1) 2015/03/30 Released by Harlan Stenn <stenn@ntp.org>