]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 30 Apr 2011 05:44:11 +0000 (01:44 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 30 Apr 2011 05:44:11 +0000 (01:44 -0400)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 4dbba1absxogAgi0I3FTPsPGLV78jA


Trivial merge