]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 12 Oct 2010 05:41:01 +0000 (01:41 -0400)
committerHarlan Stenn <stenn@ntp.org>
Tue, 12 Oct 2010 05:41:01 +0000 (01:41 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4cb3f4edqzqQhaJuoMeS3QyFCGdT7Q


Trivial merge