]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Fri, 23 Mar 2012 05:54:38 +0000 (01:54 -0400)
committerHarlan Stenn <stenn@ntp.org>
Fri, 23 Mar 2012 05:54:38 +0000 (01:54 -0400)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 4f6c101e7-0zC7TZGULM5V62TwFV_g


Trivial merge