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

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

bk: 5278a7abcxhtxrj2T6Y8dnt6HtV7KQ

diff --cc ChangeLog
index 4ca05af5e8d713678e3367218fa8424b3ff57b24,cc97debd473a1ae5ff4abc6cb416999d1d896f43..c063356d0ba274fc5a78ca1bf5a9f65602fc33f3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,6 @@@
 +* [Bug 1050] Change ONCORE log message for leap second announcement
 +  to avoid misunderstandings.
+ * [Bug 2499] Win32 user-space/loopback ppsapi provider drops samples.
  (4.2.7p393) 2013/10/16 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2272] Use C99 integer types. ntp_calendar.h and ntp_types.h .
  (4.2.7p392) 2013/10/15 Released by Harlan Stenn <stenn@ntp.org>