From: Richard Kettlewell <rjk@terraraq.org.uk>
Date: Sun, 31 Jul 2011 13:58:44 +0000 (+0100)
Subject: Merge branch 'issue29'
X-Git-Tag: branchpoint-5.1~37
X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/commitdiff_plain/f4cea438de58788edaa56785ac416046afdf6381

Merge branch 'issue29'
---

f4cea438de58788edaa56785ac416046afdf6381