]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1458
authorDave Hart <hart@ntp.org>
Sun, 19 Dec 2010 03:43:43 +0000 (03:43 +0000)
committerDave Hart <hart@ntp.org>
Sun, 19 Dec 2010 03:43:43 +0000 (03:43 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1458

bk: 4d0d7f6fBoSPq9YociryvHRquYqGrA


Trivial merge