]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/ntp-dev
authorDave Hart <hart@ntp.org>
Sat, 6 Jun 2009 04:31:15 +0000 (04:31 +0000)
committerDave Hart <hart@ntp.org>
Sat, 6 Jun 2009 04:31:15 +0000 (04:31 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1084-1204-5-8-11

bk: 4a29f113ILZ68E86JVoiZBl_B5oYVA


Trivial merge