]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1446
authorDave Hart <hart@ntp.org>
Wed, 30 Dec 2009 05:53:50 +0000 (05:53 +0000)
committerDave Hart <hart@ntp.org>
Wed, 30 Dec 2009 05:53:50 +0000 (05:53 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1446

bk: 4b3aeaeebQrhYee6tLqX3aqhOJTuBQ


Trivial merge