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

into  psp-deb1.ntp.org:/home/perlinger/ntp-dev-2306

bk: 50a9db58Xb8QZC-2WawyjAUZ7ZKTfg

diff --cc ChangeLog
index 1024675d9b74b9f3991229f942296eeab5e26ad8,a2f019a4ba126bff3fa2b9e866263e234dfa4885..ae0e37ad34075bfbf2ac01a78118bb377f0e1f88
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,5 +1,9 @@@
 +* Reinstate doc fix to authentic.html from Mike T.
 +* [Bug 1223] cleanup for rlimit changes.
+ * [Bug 2306] Added user-mode/loop-back PPS API provider for Win32
 +(4.2.7p323) 2012/11/18 Released by Harlan Stenn <stenn@ntp.org>
  * 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)