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

bk: 4c9e6abbA3QXe32R7qSTN_jBh7ot-g


Trivial merge