]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 21 Oct 2006 17:17:22 +0000 (13:17 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 21 Oct 2006 17:17:22 +0000 (13:17 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 453a5622pvdQM412s-IkIbZudg1QNA


Trivial merge