]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5b5727 b185d54)
Merge psp-deb1.ntp.org:../hart/ntp-dev-keyid-scaling
authorHarlan Stenn <stenn@ntp.org>
Tue, 28 Feb 2012 09:46:25 +0000 (04:46 -0500)
committerHarlan Stenn <stenn@ntp.org>
Tue, 28 Feb 2012 09:46:25 +0000 (04:46 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4f4ca271Bmr2fiQ4kb99gjBW5CvTxA


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