From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 21 Jul 2018 08:00:53 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_2_8P12~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7f90b350db0fa453b69760f2779597cedcb6b38;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-p12-sec

bk: 5b52e8351Q0cPvBMHwvqYKbxq3EP8A
---

b7f90b350db0fa453b69760f2779597cedcb6b38