]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 19 Jun 2006 05:27:26 +0000 (01:27 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 19 Jun 2006 05:27:26 +0000 (01:27 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev-hms

bk: 449635bedHhAu0bzXMAdDfO9MwSj_Q


Trivial merge