]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 21 Dec 2010 09:56:02 +0000 (04:56 -0500)
committerHarlan Stenn <stenn@ntp.org>
Tue, 21 Dec 2010 09:56:02 +0000 (04:56 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d1079b2aStB8h1nEhZjIaxuQUhBrw


Trivial merge