]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sun, 10 Apr 2011 01:53:59 +0000 (18:53 -0700)
committerHarlan Stenn <stenn@ntp.org>
Sun, 10 Apr 2011 01:53:59 +0000 (18:53 -0700)
into  stenn.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 4da10db7QyV3RHJKe5N5U_f1z2GF2w


Trivial merge