]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/hart/ntp-stable-msyslog
authorHarlan Stenn <stenn@ntp.org>
Tue, 21 Dec 2010 08:15:35 +0000 (03:15 -0500)
committerHarlan Stenn <stenn@ntp.org>
Tue, 21 Dec 2010 08:15:35 +0000 (03:15 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-stable

bk: 4d106227Q_s-ClvPx04khL6yfwvsKg


Trivial merge