]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 11 Nov 2009 08:56:02 +0000 (03:56 -0500)
committerHarlan Stenn <stenn@ntp.org>
Wed, 11 Nov 2009 08:56:02 +0000 (03:56 -0500)
into  pogo.udel.edu:/pogo/users/murray/bug-1226

bk: 4afa7c22Z_SSfTzPhw5BKkpDNHHuXw


Trivial merge