]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sun, 19 Feb 2012 01:49:33 +0000 (01:49 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sun, 19 Feb 2012 01:49:33 +0000 (01:49 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-autogen

bk: 4f40552dcMfeuE_dD_4Nv_kYUBDeUA


Trivial merge