]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1176
authorDave Hart <hart@ntp.org>
Tue, 5 May 2009 21:12:15 +0000 (21:12 +0000)
committerDave Hart <hart@ntp.org>
Tue, 5 May 2009 21:12:15 +0000 (21:12 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1171-3-6-cver

bk: 4a00abafvT2vEdvGsGcsn3ceAUZS8w


Trivial merge