]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12e82db 76e8045)
Merge stenn@psp-deb1.ntp.org:ntp-stable-p11
authorHarlan Stenn <stenn@ntp.org>
Wed, 24 Jan 2018 07:03:47 +0000 (23:03 -0800)
committerHarlan Stenn <stenn@ntp.org>
Wed, 24 Jan 2018 07:03:47 +0000 (23:03 -0800)
into  psp-at0.tal1.ntfo.org:/home/harlan/src/ntp-stable-p11

bk: 5a682fd3MZG1nqtJHgKybaxTmjycgg


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