]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 11 Sep 2010 06:16:11 +0000 (02:16 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 11 Sep 2010 06:16:11 +0000 (02:16 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4c8b1eabfm--9JclmWY9AD4RZ8cBeA


Trivial merge