]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/bwi/ntp-stable-aes128cmac
authorHarlan Stenn <stenn@ntp.org>
Sun, 26 Nov 2017 06:03:19 +0000 (06:03 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sun, 26 Nov 2017 06:03:19 +0000 (06:03 +0000)
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-aes128cmac-bwi

bk: 5a1a5927EQYixtkV5SQ-f2PEUNYqYg


Trivial merge