]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1503-04-18-22
authorDave Hart <hart@ntp.org>
Fri, 16 Apr 2010 14:05:57 +0000 (14:05 +0000)
committerDave Hart <hart@ntp.org>
Fri, 16 Apr 2010 14:05:57 +0000 (14:05 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1503-04-18-22

bk: 4bc86ec5qe-HwhdpIMcZPRYtcrt4VQ


Trivial merge