From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 12 May 2009 09:37:53 +0000 (-0400)
Subject: Merge cleanup
X-Git-Tag: NTP_4_2_5P175~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b267e80f5bffc9e020c572fcdb1587f2e7b47e7f;p=thirdparty%2Fntp.git

Merge cleanup

bk: 4a094371IcF9oAbxxV7WfrjiF4KLNg
---

diff --git a/ChangeLog b/ChangeLog
index 62c12d77e..ba20c569e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Include (4.2.4p7-RC7)
 * [Bug 1180] ntpd won't start with more than ~1000 interfaces
 * [Bug 1182] Documentation typos and missing bits.
 * [Bug 1183] COM port support should extend past COM3