]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/hart/ntp-dev-tvalops
authorHarlan Stenn <stenn@ntp.org>
Thu, 27 Jan 2011 05:51:51 +0000 (00:51 -0500)
committerHarlan Stenn <stenn@ntp.org>
Thu, 27 Jan 2011 05:51:51 +0000 (00:51 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d4107f7KolTFn_FiHOsLq3F7IxiQw


Trivial merge