]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev
authorDave Hart <hart@ntp.org>
Fri, 15 Apr 2011 15:18:22 +0000 (15:18 +0000)
committerDave Hart <hart@ntp.org>
Fri, 15 Apr 2011 15:18:22 +0000 (15:18 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-libevent-20110415

bk: 4da861bee4s8UGn9xnzUcgAetbou-g


Trivial merge