]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 26 Jun 2006 07:27:36 +0000 (03:27 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 26 Jun 2006 07:27:36 +0000 (03:27 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 449f8c68aecVjFk0an8l0a3Hwhywlg


Trivial merge