]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev
authorDave Hart <hart@ntp.org>
Sun, 9 Jan 2011 20:21:24 +0000 (20:21 +0000)
committerDave Hart <hart@ntp.org>
Sun, 9 Jan 2011 20:21:24 +0000 (20:21 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-perlinger-nmea

bk: 4d2a18c4wLZIheqc_B6LqeF03gt3Nw


Trivial merge