]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1738
authorDave Hart <hart@ntp.org>
Mon, 6 Dec 2010 02:14:08 +0000 (02:14 +0000)
committerDave Hart <hart@ntp.org>
Mon, 6 Dec 2010 02:14:08 +0000 (02:14 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1738

bk: 4cfc46f0ikSiwG1S0b1kv7h5jdK94A


Trivial merge