]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77d6095 7e8680a)
Merge psp-at0.tal1.ntfo.org:/home/harlan/src/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 31 Dec 2017 05:48:36 +0000 (21:48 -0800)
committerHarlan Stenn <stenn@ntp.org>
Sun, 31 Dec 2017 05:48:36 +0000 (21:48 -0800)
into  psp-at0.tal1.ntfo.org:/home/harlan/src/ntp-stable-p11

bk: 5a487a34oCdMgh_c8iFR4HYer-8M2g


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