From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 21 Nov 2012 02:14:05 +0000 (-0500)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P326~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faa2c988726eb33fed01678553a49fafd2fb25e7;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-deb1.ntp.org:/home/stenn/ntp-dev-dlm

bk: 50ac38edBR3czYwtMqdNRy3ho9lh2w
---

faa2c988726eb33fed01678553a49fafd2fb25e7
diff --cc ChangeLog
index 59a487ad5,047470351..3ff9b8efa
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,5 +1,7 @@@
 +* [Bug 1214] 'proto: precision = ...' should be at INFO, not NOTICE.
- * [Bug 2202] ntpq.html: there is no "acv" billboard.
 +* [Bug 2246] Clear sys_leap when voting says to disarm the leap.
+ (4.2.7p325) 2012/11/20 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 2202] ntpq.html: there is no "acv" billboard.
  * [Bug 2306] keep pps hack for Win32 even if user-mode/loopback
    PPS API is activated on a serial line.
  (4.2.7p324) 2012/11/19 Released by Harlan Stenn <stenn@ntp.org>