]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk2.ntp.org./ntp-stable
authorDave Hart <hart@ntp.org>
Sun, 12 Dec 2010 06:18:55 +0000 (06:18 +0000)
committerDave Hart <hart@ntp.org>
Sun, 12 Dec 2010 06:18:55 +0000 (06:18 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1741

bk: 4d04694fsfd7pNcTishB4QhRhvtI3g


Trivial merge