]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 9 Sep 2006 03:28:37 +0000 (23:28 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 9 Sep 2006 03:28:37 +0000 (23:28 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 450234e5CZeokSw5dybMvJHizfsPXA


Trivial merge