From: Juergen Perlinger <perlinger@ntp.org>
Date: Mon, 3 Aug 2015 18:37:16 +0000 (+0200)
Subject: Merge perlinger@psp-fb1.ntp.org:ntp-stable-cal2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab23a8b762546840a01463ae1d4984308f756e40;p=thirdparty%2Fntp.git

Merge perlinger@psp-fb1.ntp.org:ntp-stable-cal2
into  hydra.(none):/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-cal2

bk: 55bfb4dcwzny4GMZ9oTekAmucbnXmA
---

ab23a8b762546840a01463ae1d4984308f756e40
diff --cc ChangeLog
index aa4ef6999,9a0360844..80749108c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -15,9 -11,7 +15,10 @@@
  * [Bug 2875] sntp/Makefile.am: Get rid of DIST_SUBDIRS.  libevent must
    be configured for the distribution targets.  Harlan Stenn.
  * [Bug 2883] ntpd crashes on exit with empty driftfile.  Miroslav Lichvar.
 +* [Bug 2886] Mis-spelling: "outlyer" should be "outlier".  dave@horsfall.org
+ * [Bug 2888] streamline calendar functions.  perlinger@ntp.org
 +* [Bug 2889] ntp-dev-4.3.67 does not build on Windows.  perlinger@ntp.org
 +* [Bug 2890] Ignore ENOBUFS on routing netlink socket.  Konstantin Khlebnikov.
  * libntp/emalloc.c: Remove explicit include of stdint.h.  Harlan Stenn.
  * Put Unity CPPFLAGS items in unity_config.h.  Harlan Stenn.
  * tests/ntpd/g_leapsec.cpp typo fix.  Harlan Stenn.