]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/perlinger/ntp-dev-timeops
authorHarlan Stenn <stenn@ntp.org>
Wed, 19 Jan 2011 01:43:51 +0000 (20:43 -0500)
committerHarlan Stenn <stenn@ntp.org>
Wed, 19 Jan 2011 01:43:51 +0000 (20:43 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d3641d7jnVeDN5CiwDnBejnnBbVxQ


Trivial merge