]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
pull resolution
authorHarlan Stenn <stenn@ntp.org>
Thu, 23 Aug 2001 08:17:09 +0000 (04:17 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 23 Aug 2001 08:17:09 +0000 (04:17 -0400)
bk: 3b84bc05Qdq_H4TUHe6_tlbCNBxoXg


Trivial merge