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

bk: 4d0acb02WoXjwh5sqnLlOJertYjENw


Trivial merge