]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 12 Oct 2010 03:11:07 +0000 (20:11 -0700)
committerHarlan Stenn <stenn@ntp.org>
Tue, 12 Oct 2010 03:11:07 +0000 (20:11 -0700)
into  stenn.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable

bk: 4cb3d1cbFDIwhZeUnk2SCRr9_F2XSw


Trivial merge