From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 19 Jun 2007 23:07:36 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=134e971fa54ea075b2d0a8321b6238af89f4f178;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/neal/neal.ntp-dev

bk: 467861b8aFkL4G2qewzlI3fhF0aqqw
---

134e971fa54ea075b2d0a8321b6238af89f4f178
diff --cc ChangeLog
index 7453dd2dab,f4c24d209f..7fb7b54042
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* Allow null driftfile.
+ * More leap second fixes from Dave Mills.
  * Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES.
  * [Bug #629] changes to ensure broadcast works including on wildcard addresses
  * [Bug 853] get_node() must return a pointer to maximally-aligned memory.