]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed19ad1 206b8d3)
Merge psp-deb1.ntp.org:/home/hart/ntp-dev-ntpq-amp
authorHarlan Stenn <stenn@ntp.org>
Thu, 23 Dec 2010 21:03:19 +0000 (16:03 -0500)
committerHarlan Stenn <stenn@ntp.org>
Thu, 23 Dec 2010 21:03:19 +0000 (16:03 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d13b917DuNh-PU-l4J-MsBb0tNhpA


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