]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcbe856 d49b083)
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 1 Apr 2010 07:34:33 +0000 (03:34 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 1 Apr 2010 07:34:33 +0000 (03:34 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4bb44c89r9FTkMLtEmI1EQ5G19yfJg


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