From: Dave Hart <hart@ntp.org>
Date: Mon, 14 Dec 2009 21:45:36 +0000 (+0000)
Subject: Correct ChangeLog merge from ntp-stable-1418
X-Git-Tag: NTP_4_2_7P1~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4de7d835549132db5519b9dc9c1cea1d948b7882;p=thirdparty%2Fntp.git

Correct ChangeLog merge from ntp-stable-1418

bk: 4b26b200HOQvC2wj8euXfg-yd68yHw
---

diff --git a/ChangeLog b/ChangeLog
index 58295de6b..a9b64a398 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,9 @@
+* [Bug 1418] building ntpd/ntpdc/ntpq statically with ssl fails.
 (4.2.7p0) 2009/12/13 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
 * [Bug 1414] Enable "make distcheck" success with BSD make.
 (4.2.7) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1407] configure.ac: recent GNU Make -v does not include "version".
----
-
-* [Bug 1418] building ntpd/ntpdc/ntpq statically with ssl fails.
 
 ---
 (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>