]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 12 Dec 2017 06:37:01 +0000 (06:37 +0000)
committerHarlan Stenn <stenn@ntp.org>
Tue, 12 Dec 2017 06:37:01 +0000 (06:37 +0000)
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-aes128cmac

bk: 5a2f790d3NghtSe2l5fCOhnBMVQqow


Trivial merge