]> 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 05:18:59 +0000 (00:18 -0500)
committerHarlan Stenn <stenn@ntp.org>
Wed, 9 Dec 2009 05:18:59 +0000 (00:18 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4b1f3343MTxgp5eiw59LrtAounuugQ


Trivial merge