]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge stenn@psp-deb1.ntp.org:ntp-stable-p11
authorHarlan Stenn <stenn@ntp.org>
Sun, 31 Dec 2017 07:49:23 +0000 (23:49 -0800)
committerHarlan Stenn <stenn@ntp.org>
Sun, 31 Dec 2017 07:49:23 +0000 (23:49 -0800)
into  psp-at0.tal1.ntfo.org:/home/harlan/src/ntp-stable-p11

bk: 5a489683POGcs7jzP2FMOj9u-zUZhQ


Trivial merge