]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge stenn@psp-deb1.ntp.org:ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 30 Dec 2017 11:57:07 +0000 (03:57 -0800)
committerHarlan Stenn <stenn@ntp.org>
Sat, 30 Dec 2017 11:57:07 +0000 (03:57 -0800)
into  psp-at0.tal1.ntfo.org:/home/harlan/src/ntp-stable

bk: 5a477f134TiXOiKfmrrlZ23mXs2jvw


Trivial merge