From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 15 Jun 2008 11:32:54 +0000 (+0100)
Subject: Merge from disorder.4.0 up to 4.0.1
X-Git-Tag: 4.1~17
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/89fa4d7bfe1d02662a65c4d16faa8a67a3e1041b

Merge from disorder.4.0 up to 4.0.1
---

89fa4d7bfe1d02662a65c4d16faa8a67a3e1041b