From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 18 Nov 2012 08:55:52 +0000 (-0500)
Subject: Merge deacon.udel.edu:/backroom/snaps/ntp-dev
X-Git-Tag: NTP_4_2_7P323~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aafad5d406b4e6994ac9e533213d145fd7d19563;p=thirdparty%2Fntp.git

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

bk: 50a8a298HcP6QpsNvweTzGSAyXCSLw
---

aafad5d406b4e6994ac9e533213d145fd7d19563
diff --cc ChangeLog
index afdba49dc,28f9824df..29f423a6b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* html/ updates from Dave Mills.
+ (4.2.7p322) 2012/11/15 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1223] Allow configurable values for RLIMIT_STACK and
    RLIMIT_MEMLOCK.
  * [Bug 1320] Log ntpd's initial command-line parameters. (updated fix)