]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sun, 27 Feb 2011 09:32:33 +0000 (04:32 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sun, 27 Feb 2011 09:32:33 +0000 (04:32 -0500)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 4d6a1a31DSrzDezb_K7BpoORxqhTug


Trivial merge