]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge dlh-7551.ad.hartbrothers.com:C:/ntp/ntp-dev
authorDave Hart <hart@ntp.org>
Sat, 16 Jun 2012 05:55:32 +0000 (05:55 +0000)
committerDave Hart <hart@ntp.org>
Sat, 16 Jun 2012 05:55:32 +0000 (05:55 +0000)
into  dlh-7551.ad.hartbrothers.com:C:/ntp/ntp-dev-libevent-20120614

bk: 4fdc1fd4nEP-04zbpzo-uDmuDFLx0Q


Trivial merge