From: Dave Hart <hart@ntp.org>
Date: Tue, 29 Nov 2011 13:35:16 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_2_6P5_RC2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de429e860455242f8f56eee704e59ac66d78874f;p=thirdparty%2Fntp.git

merge cleanup

bk: 4ed4df94UvbIzKaWCxRPmQNFeaT76A
---

diff --git a/ChangeLog b/ChangeLog
index a5ec25b81..6b6e52687 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,6 @@
   (from David Mills).
 * Never send KoD rate limiting response to MODE_SERVER response.
 
-
 ---
 (4.2.6p5-RC1) 2011/10/18 Released by Harlan Stenn <stenn@ntp.org>