]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-updatepoint-1412-13-14-18
authorDave Hart <hart@ntp.org>
Fri, 18 Dec 2009 06:42:22 +0000 (06:42 +0000)
committerDave Hart <hart@ntp.org>
Fri, 18 Dec 2009 06:42:22 +0000 (06:42 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-updatepoint-1412-13-14-18-19

bk: 4b2b244eOJXkSSzJpe4nGQwqVnjGzA


Trivial merge