]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 26 Jul 2006 06:58:54 +0000 (02:58 -0400)
committerHarlan Stenn <stenn@ntp.org>
Wed, 26 Jul 2006 06:58:54 +0000 (02:58 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 44c712aex7l6wJ1UCMG7r7mZyb2FPQ


Trivial merge