]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:/usa/mayer/ntp-dev-windowscomp2
authorDave Hart <hart@ntp.org>
Tue, 1 Sep 2009 08:24:08 +0000 (08:24 +0000)
committerDave Hart <hart@ntp.org>
Tue, 1 Sep 2009 08:24:08 +0000 (08:24 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1289-repair

bk: 4a9cda28FNl8jTO1Fs2PGoOd6WDBiw


Trivial merge