From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 13 Jun 2018 04:54:41 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_2_8P12~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47846e32f5adac4f8550bd97ec98933acc896423;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3445

bk: 5b20a39149Tjgg39GV9p1h2T9iUZrg
---

47846e32f5adac4f8550bd97ec98933acc896423