]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14a007f f8522bb)
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 13 Jun 2015 09:30:41 +0000 (05:30 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 13 Jun 2015 09:30:41 +0000 (05:30 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 557bf841XKFkq8xBqQH2Zr65j8VXvA


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