From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 8 Sep 2008 07:54:58 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P128~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a658caf256c65f5cce4997742ad5f88d2f13e7b;p=thirdparty%2Fntp.git

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

bk: 48c4da52d7nne4KndX1cgXaYmV4pPA
---

9a658caf256c65f5cce4997742ad5f88d2f13e7b
diff --cc ChangeLog
index 8095241f9,a1826ac80..8b49c8f95
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
- * Prepare for GSoC2008 NTP MIB daemon import.
++* Import Heiko Gerstung's GSoC2008 NTP MIB daemon.
+ (4.2.5p127) 2008/09/01 Released by Harlan Stenn <stenn@ntp.org>
+ (4.2.5p126) 2008/08/31 Released by Harlan Stenn <stenn@ntp.org>
  * Stop libtool-1.5 from looking for C++ or Fortran.
  * [BUG 610] Documentation update for NMEA reference clock driver.
  * [Bug 828] Fix IPv4/IPv6 address parsing.