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

bk: 5a3b6ceaX69rs_D9b9zNzmLvANFo2w


Trivial merge