]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 18 Jun 2006 02:40:50 +0000 (22:40 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sun, 18 Jun 2006 02:40:50 +0000 (22:40 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4494bd32CDEKbuZFKMkgwKE2LqEU1w


Trivial merge