Merge bk://bk.ntp.org/ntp-dev

into  hms-mbp11.local:/Users/harlan/src/ntp-dev-dlm

bk: 50ab0b21tyJZT6RxEAOBfvmwGUYFAw

diff --cc ChangeLog
index 5d041c98564b505e0081a580fc6d82c26bfd1059,849299cfcabf53f0daf83e1bd45f019edf97c8c0..59a487ad5e02597dc48943c640e16845b0260d6c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,5 +1,8 @@@
+ * [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.
 +* [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>
  * Reinstate doc fix to authentic.html from Mike T.
  * [Bug 1223] cleanup for rlimit changes.