]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1970
authorDave Hart <hart@ntp.org>
Wed, 20 Jul 2011 19:41:48 +0000 (19:41 +0000)
committerDave Hart <hart@ntp.org>
Wed, 20 Jul 2011 19:41:48 +0000 (19:41 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1970

bk: 4e272f7cfgUgZMSVPZSYqiDu_cLZ-w


Trivial merge