]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:/usa/burnicki/ntp-dev-1510
authorDave Hart <hart@ntp.org>
Sun, 12 Dec 2010 08:48:40 +0000 (08:48 +0000)
committerDave Hart <hart@ntp.org>
Sun, 12 Dec 2010 08:48:40 +0000 (08:48 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1741

bk: 4d048c68-Ic_c0pijoTgCXVhIb-CbA


Trivial merge