From: Dave Hart <hart@ntp.org>
Date: Sun, 13 Dec 2009 04:18:43 +0000 (+0000)
Subject: correct merge from ntp-stable-1414
X-Git-Tag: NTP_4_2_7P0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f19311dba42ab87baaf3f92f8622b87eaf89dc3;p=thirdparty%2Fntp.git

correct merge from ntp-stable-1414

bk: 4b246b23tctb6H2aK0HxhE2nKcpNmg
---

diff --git a/ChangeLog b/ChangeLog
index fa191aed0..504c669a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,7 @@
+* [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 1414] Enable "make distcheck" success with BSD make.
-
 ---
 (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>
 * Include (4.2.4p8) - [Sec 1331] DoS with mode 7 packets - CVE-2009-3563.