]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 27 Feb 2018 11:55:19 +0000 (06:55 -0500)
committerHarlan Stenn <stenn@ntp.org>
Tue, 27 Feb 2018 11:55:19 +0000 (06:55 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-stable

bk: 5a9547274xWwGRtrrbttG16b9PtAng


Trivial merge