]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 12 Mar 2012 08:10:13 +0000 (01:10 -0700)
committerHarlan Stenn <stenn@ntp.org>
Mon, 12 Mar 2012 08:10:13 +0000 (01:10 -0700)
into  stenn.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 4f5daf65lXkJV5QBWgHcELZ4BawiQg


Trivial merge