]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 11 Apr 2011 01:42:40 +0000 (18:42 -0700)
committerHarlan Stenn <stenn@ntp.org>
Mon, 11 Apr 2011 01:42:40 +0000 (18:42 -0700)
into  hms-mbp.local:/Users/harlan/src/ntp-dev

bk: 4da25c90w9eAxs6rOhv7RvyzoespCQ


Trivial merge