]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca0f2a1 e6ea13f)
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 25 Apr 2015 01:10:30 +0000 (21:10 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 25 Apr 2015 01:10:30 +0000 (21:10 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 553ae986yeX9kqpDXn70rESrGaSopA


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