]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1794-95
authorDave Hart <hart@ntp.org>
Wed, 26 Jan 2011 03:09:04 +0000 (03:09 +0000)
committerDave Hart <hart@ntp.org>
Wed, 26 Jan 2011 03:09:04 +0000 (03:09 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-tvalops

bk: 4d3f9050mYau4vLEqa6uo7g0TLvrxA


Trivial merge