]> granicus.if.org Git - libevent/commitdiff
Merge branch 'master' into 21_size_and_misc_fixes
authorMark Ellzey <socket@gmail.com>
Tue, 12 May 2015 02:18:54 +0000 (22:18 -0400)
committerMark Ellzey <socket@gmail.com>
Tue, 12 May 2015 02:18:54 +0000 (22:18 -0400)

Trivial merge