]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sun, 6 Aug 2006 02:26:46 +0000 (22:26 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sun, 6 Aug 2006 02:26:46 +0000 (22:26 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 44d55366zl-l7Xm6tLhwwe2tm4CN6g


Trivial merge