Merge pull request #125 from libevent/master
commit01c7b45111f67f8692727c756c52dd3049be74df
authorMark Ellzey <socket@gmail.com>
Mon, 21 Dec 2015 23:33:50 +0000 (21 15:33 -0800)
committerMark Ellzey <socket@gmail.com>
Mon, 21 Dec 2015 23:33:50 +0000 (21 15:33 -0800)
tree952498d736b8d8fbc42804b3b84f2022b6b2cbf9
parent6e7a580c15a7722f94630184189ae3af6afabdd9
parentbcc8f0f1c2291ab51174e95925e35762a1cfeabe
Merge pull request #125 from libevent/master

update upstream