From: Dave Hart <hart@ntp.org>
Date: Thu, 23 Apr 2009 20:41:53 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b01c828b8edc54f23dee8cfb89349004afc0d3d;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1057

bk: 49f0d291FC1yALZJm-6s_9UtwEQNNg
---

3b01c828b8edc54f23dee8cfb89349004afc0d3d
diff --cc ChangeLog
index 1d054830c6,617aef4011..465bc4d389
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 1057] ntpdc unconfig failure
+ (4.2.5p165) 2009/04/23 Released by Harlan Stenn <stenn@ntp.org>
  * WWVB refclock cleanup from Dave Mills.
  * Code cleanup: requested_key -> request_key.
  * [Bug 833] ignore whitespace at end of remote configuration lines