]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 2 Oct 2010 07:50:48 +0000 (03:50 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 2 Oct 2010 07:50:48 +0000 (03:50 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4ca6e458j5p9jedlPsd6zrZ9AXg5Ew


Trivial merge