From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 24 Jan 2015 02:57:34 +0000 (+0000)
Subject: Merge psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable
X-Git-Tag: NTP_4_2_8P1_RC1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ae0415a4abc3104c162a1f3e9601202dbc981d7;p=thirdparty%2Fntp.git

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

bk: 54c30a1eAkSmLhUpEEz7GOwNbkDNjA
---

8ae0415a4abc3104c162a1f3e9601202dbc981d7
diff --cc ChangeLog
index cc9788db0,32b7b34ae..609022aea
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,8 @@@
  ---
  
+ * [Bug 2617] Fix sntp Usage documentation section.
+ * [Sec 2672] Code cleanup: On some OSes ::1 can be spoofed...
 +* Copyright update.
  ---
  (4.2.8p1-beta5) 2015/01/07 Released by Harlan Stenn <stenn@ntp.org>