]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk2.ntp.org./ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 13 Oct 2010 06:12:08 +0000 (06:12 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 13 Oct 2010 06:12:08 +0000 (06:12 +0000)
into  psp-fb2.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/hart/ntp-dev-1080

bk: 4cb54db8enLAljCP7X0mLgHYSKRHUQ


Trivial merge