From: Alec Thomas <alec@swapoff.org>
Date: Mon, 27 Oct 2014 00:20:05 +0000 (+1100)
Subject: Merge branch 'master' of github.com:alecthomas/entityx
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=a57f7436212de0ffaf811f23d24bec8b9838a6df;p=clyne%2Fentityx.git

Merge branch 'master' of github.com:alecthomas/entityx
---

a57f7436212de0ffaf811f23d24bec8b9838a6df