]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 24 Jun 2006 20:13:51 +0000 (16:13 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 24 Jun 2006 20:13:51 +0000 (16:13 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 449d9cffoGcnk2Ghac3ocxJ7sbo3Lg


Trivial merge