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

bk: 4f696c8caZnK-17jfpd5gTMhYMVO3A


Trivial merge