]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 9 Dec 2009 08:51:17 +0000 (03:51 -0500)
committerHarlan Stenn <stenn@ntp.org>
Wed, 9 Dec 2009 08:51:17 +0000 (03:51 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4b1f65050O0x-qVakBSne-FbhK9o3w


Trivial merge