]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 28 Aug 2006 07:18:44 +0000 (03:18 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 28 Aug 2006 07:18:44 +0000 (03:18 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 44f298d4Gp8FGZHha2z0-EyAtDlpSA


Trivial merge