From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 3 Mar 2020 12:10:02 +0000 (-0800)
Subject: Merge ntp-build.tal1.ntfo.org:/export/home/u1/harlan/ntp-stable-p13-sec
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdf842e7ae26f806184aa9d1c23093b6240b4ebf;p=thirdparty%2Fntp.git

Merge ntp-build.tal1.ntfo.org:/export/home/u1/harlan/ntp-stable-p13-sec
into  ntp-build.tal1.ntfo.org:/export/home/u1/harlan/ntp-stable-merge

bk: 5e5e491ackmWLsifRmHUYM1yix4f6Q
---

fdf842e7ae26f806184aa9d1c23093b6240b4ebf