]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 12 Apr 2007 10:47:01 +0000 (06:47 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 12 Apr 2007 10:47:01 +0000 (06:47 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 461e0e25XxZMcJDnjfK5EFqS0unMPw


Trivial merge