From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 5 Nov 2013 08:09:15 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P394~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=640d0e2b5c368444641aaa67abf390a2f181816f;p=thirdparty%2Fntp.git

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

bk: 5278a7abcxhtxrj2T6Y8dnt6HtV7KQ
---

640d0e2b5c368444641aaa67abf390a2f181816f
diff --cc ChangeLog
index 4ca05af5e,cc97debd4..c063356d0
--- a/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>