From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 26 Aug 2010 10:10:18 +0000 (-0400)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P44~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fde3a6378b8c3f8462fb977a14b98f60cc196a1f;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/karlsson/bugs/ntp-dev-1573

bk: 4c763d8a-WQ6UvY3QyaKWh7dJr-09Q
---

fde3a6378b8c3f8462fb977a14b98f60cc196a1f
diff --cc ChangeLog
index e360900f6,c806a751c..c662758d7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 1573] from 4.2.6p3-RC1: Miscalculation of offset in sntp.
+ (4.2.7p43) 2010/08/26 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1602] Refactor some of the sntp/ directory to facililtate testing.
  (4.2.7p42) 2010/08/18 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1593] ntpd abort in free() with logconfig syntax error.