From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 24 Jul 2018 09:17:20 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable
X-Git-Tag: NTP_4_2_8P12~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f12f06f2e211ba76bf285f337b3e804e167fc6b;p=thirdparty%2Fntp.git

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

bk: 5b56eea068S09nLvSuQHvS3ma9RMrQ
---

7f12f06f2e211ba76bf285f337b3e804e167fc6b