merge cleanup

bk: 4ed4df94UvbIzKaWCxRPmQNFeaT76A

diff --git a/ChangeLog b/ChangeLog
index a5ec25b814e6b2580ba5c141d35de5c0b2cb7a1f..6b6e526872b0ce4328e9da10d3aeec7a82aac0d2 100644 (file)
--- 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>