]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1157-58-60-mayer
authorDave Hart <hart@ntp.org>
Mon, 20 Apr 2009 22:56:55 +0000 (22:56 +0000)
committerDave Hart <hart@ntp.org>
Mon, 20 Apr 2009 22:56:55 +0000 (22:56 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1125-52-53-57-58-59-60-mayer

bk: 49ecfdb7SkgvwPeKepM5CAcnOij3ZA


Trivial merge