]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 24 Mar 2012 23:10:03 +0000 (19:10 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 24 Mar 2012 23:10:03 +0000 (19:10 -0400)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 4f6e544bscxx7jVJhkes7wzLiqD7ew


Trivial merge