From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 25 Jul 2018 10:00:58 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable
X-Git-Tag: NTP_4_2_8P12~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1290992d4aeb9c77102638c021f25d5aa4400f05;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: 5b584a5aNvM_8D16vnTZkkFivS6eTQ
---

1290992d4aeb9c77102638c021f25d5aa4400f05