]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d781dd 9412dac)
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 8 Jun 2015 01:22:15 +0000 (21:22 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 8 Jun 2015 01:22:15 +0000 (21:22 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 5574ee47K9HEAEfSi68VL9S4j5_Xdw


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