]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk2.ntp.org./ntp-dev
authorDave Hart <hart@ntp.org>
Tue, 22 Feb 2011 06:28:38 +0000 (06:28 +0000)
committerDave Hart <hart@ntp.org>
Tue, 22 Feb 2011 06:28:38 +0000 (06:28 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-m4quote

bk: 4d635796c8SAH3kv_LW2RWZGT2aFJA


Trivial merge