]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 31 Mar 2010 07:20:35 +0000 (03:20 -0400)
committerHarlan Stenn <stenn@ntp.org>
Wed, 31 Mar 2010 07:20:35 +0000 (03:20 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4bb2f7c3_M8Rg9hJYPfJjKtosZZIXg


Trivial merge