From: Antony <acron1@gmail.com>
Date: Wed, 30 Oct 2013 08:30:12 +0000 (-0700)
Subject: Merge pull request #1 from alecthomas/master
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=fa9296278020834d660c9fcc05c32c719263fce3;p=clyne%2Fentityx.git

Merge pull request #1 from alecthomas/master

Merge changes from upstream
---

fa9296278020834d660c9fcc05c32c719263fce3