]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 12 Sep 2005 02:34:00 +0000 (22:34 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 12 Sep 2005 02:34:00 +0000 (22:34 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 4324e918EVQcDz_eLgNPro7RY67NGg


Trivial merge