]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-fb1.ntp.org:/a/etc/amd.net/nfs-stor0.ntfo.org/root/nfs/home/perlinger/ntp...
authorHarlan Stenn <stenn@ntp.org>
Wed, 5 Dec 2018 06:06:15 +0000 (01:06 -0500)
committerHarlan Stenn <stenn@ntp.org>
Wed, 5 Dec 2018 06:06:15 +0000 (01:06 -0500)
into  psp-fb1.ntp.org:/a/etc/amd.net/nfs-stor0.ntfo.org/root/nfs/home/stenn/ntp-stable-3556

bk: 5c076ad7Qg72fENRRuRxLHW0NveMGQ


Trivial merge