From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 24 Jan 2015 04:06:46 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_2_8P1_RC1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0050138197ad074a493dc185f3317a840b35db9d;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-copyright

bk: 54c31a56MAkbUQ_lAHAVgwsQk-QACA
---

0050138197ad074a493dc185f3317a840b35db9d
diff --cc ChangeLog
index 609022aea,379ceab8b..80b4ff162
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,10 +1,11 @@@
  ---
  
+ * Start the RC for 4.2.8p1.
+ * [Bug 2187] Update version number generation scripts.
  * [Bug 2617] Fix sntp Usage documentation section.
  * [Sec 2672] Code cleanup: On some OSes ::1 can be spoofed...
 +* Copyright update.
+ * Fix the package name.
  ---
  (4.2.8p1-beta5) 2015/01/07 Released by Harlan Stenn <stenn@ntp.org>