]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Thu, 26 May 2011 22:44:21 +0000 (18:44 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 26 May 2011 22:44:21 +0000 (18:44 -0400)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 4dded7c5M-UdTnwfAHW6QPoXFc-QbQ


Trivial merge