]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 11 Apr 2006 08:54:31 +0000 (04:54 -0400)
committerHarlan Stenn <stenn@ntp.org>
Tue, 11 Apr 2006 08:54:31 +0000 (04:54 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev-hms

bk: 443b6ec78d1GQ5jXh_sUWqDedNBibw


Trivial merge