]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 3 Nov 2010 10:01:05 +0000 (10:01 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 3 Nov 2010 10:01:05 +0000 (10:01 +0000)
into  deacon.udel.edu:/deacon/backroom/snaps/ntp-dev

bk: 4cd132e1LVUW3nGZSx8H65oC9GUIJg


Trivial merge