]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3833e47 cdf74a6)
Merge psp-at0.tal1.ntfo.org:/home/harlan/src/ntp-stable-p11
authorHarlan Stenn <stenn@ntp.org>
Mon, 25 Dec 2017 13:05:16 +0000 (05:05 -0800)
committerHarlan Stenn <stenn@ntp.org>
Mon, 25 Dec 2017 13:05:16 +0000 (05:05 -0800)
into  psp-at0.tal1.ntfo.org:/home/harlan/src/ntp-stable-aes128cmac

bk: 5a40f78cmWUJFmaM8Nt0iW5O-Osu3Q


Trivial merge
Mirror of https://github.com/ntp-project/ntp.git