From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 16 Jan 2012 01:53:45 +0000 (+0000)
Subject: Merge with upstream
X-Git-Tag: v0.4.0~6^2~2
X-Git-Url: https://repo.or.cz/w/luaevent.git/commitdiff_plain/824c1ad42aba6555df60bc2f2d4417a3f9c49e1b

Merge with upstream
---

824c1ad42aba6555df60bc2f2d4417a3f9c49e1b