From: Senji <circle@ysolde.ucam.org>
Date: Wed, 1 Oct 2014 16:07:52 +0000 (+0100)
Subject: Merge branch 'master' of /home/jdamery/scm/Circle
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~jdamery/git?a=commitdiff_plain;h=a71d449b0429295075ab099963fc93c665b96097;p=Circle.git

Merge branch 'master' of /home/jdamery/scm/Circle
---

a71d449b0429295075ab099963fc93c665b96097