From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 18 Oct 2009 21:54:18 +0000 (+0100)
Subject: Merge from disorder.dev.
X-Git-Tag: 5.0~86^2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/4942ee7d61bf22ba38bf026c7d05028cb7db0d54

Merge from disorder.dev.
---

4942ee7d61bf22ba38bf026c7d05028cb7db0d54