]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1754
authorDave Hart <hart@ntp.org>
Fri, 17 Dec 2010 00:02:50 +0000 (00:02 +0000)
committerDave Hart <hart@ntp.org>
Fri, 17 Dec 2010 00:02:50 +0000 (00:02 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-libopts-33.4.8

bk: 4d0aa8aarnQT1BVmMkwNEKfOp4NTtA


Trivial merge