]> granicus.if.org Git - libevent/commitdiff
Merge branch 'master' into issue237
authorMark Ellzey <socket@gmail.com>
Mon, 11 May 2015 16:34:30 +0000 (12:34 -0400)
committerMark Ellzey <socket@gmail.com>
Mon, 11 May 2015 16:34:30 +0000 (12:34 -0400)

Trivial merge