]> 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 08:03:28 +0000 (08:03 +0000)
committerDave Hart <hart@ntp.org>
Mon, 6 Dec 2010 08:03:28 +0000 (08:03 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1738

bk: 4cfc98d0Jxhs0yufIhXyxKVJRTkEEQ


Trivial merge