From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 24 Dec 2008 08:29:58 +0000 (-0500)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fb768a0f8bf106be77a20b80baf43877d096b2f;p=thirdparty%2Fntp.git

Merge whimsy.udel.edu:/deacon/backroom/ntp-dev
into  whimsy.udel.edu:/deacon/backroom/ntp-dev-samba

bk: 4951f306bBfBK-DKYWzS1Cgew5nz7w
---

7fb768a0f8bf106be77a20b80baf43877d096b2f
diff --cc ChangeLog
index be1567a4f7,485abe9098..6a4b7a0b76
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 1028] Support for W32Time authentication via Samba.
+ (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>
  * [Bug 1099] Fixed wrong behaviour in sntp's crypto.c.