]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-os1:/home/hart/ntp-dev-libevent-upstream
authorDave Hart <hart@ntp.org>
Thu, 14 Apr 2011 23:29:39 +0000 (23:29 +0000)
committerDave Hart <hart@ntp.org>
Thu, 14 Apr 2011 23:29:39 +0000 (23:29 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-libevent-20110414

bk: 4da783633mS46eeqAS6elrsQKj3OYw


Trivial merge