From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 9 Jan 2009 10:25:00 +0000 (-0500)
Subject: Merge bk://maccarony.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P153~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=653ab81e49cff41c89681638425576781af7eaa7;p=thirdparty%2Fntp.git

Merge bk://maccarony.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/burnicki/ntp-dev-bug-1112

bk: 496725fcW_ZEINVE1VN_VHsKYcSfAg
---

653ab81e49cff41c89681638425576781af7eaa7
diff --cc ChangeLog
index 82c7a4f9b,41a7ad546..439d3a0e0
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,5 +1,8 @@@
 +* Renamed gsoc_sntp/:fetch-stubs to gsoc_sntp/fetch-stubs to avoid
 +  file name problems under Windows.
 +  Removed German umlaut from log msg for 4.2.5p142.
+ (4.2.5p152) 2009/01/08 Released by Harlan Stenn <stenn@ntp.org>
+ * Include (4.2.4p6) 2009/01/08 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.5p151) 2008/12/23 Released by Harlan Stenn <stenn@ntp.org>
  * Stats file logging cleanup from Dave Mills.
  (4.2.5p150) 2008/12/15 Released by Harlan Stenn <stenn@ntp.org>