]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1518
authorDave Hart <hart@ntp.org>
Sat, 10 Apr 2010 03:27:02 +0000 (03:27 +0000)
committerDave Hart <hart@ntp.org>
Sat, 10 Apr 2010 03:27:02 +0000 (03:27 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1518-20-22

bk: 4bbff006mzJn1pCvHG6UAF9HwHnD7w


Trivial merge