]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12ecd85 9a4dfc1)
Merge psp-os1.ntp.org:/home/hart/ntp-stable
authorDave Hart <hart@ntp.org>
Sat, 1 Jan 2011 11:25:34 +0000 (11:25 +0000)
committerDave Hart <hart@ntp.org>
Sat, 1 Jan 2011 11:25:34 +0000 (11:25 +0000)
into  psp-os1.ntp.org:/home/hart/ntp-dev

bk: 4d1f0f2e8zw0-_tqSP3TKjBOi4LqWA


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