From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Mon, 9 Jun 2008 07:37:10 +0000 (+0100)
Subject: Merge from disorder.4.0
X-Git-Tag: 4.1~20
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/1bce463aca30f9a111ed8f0e8ec0605e01311f89

Merge from disorder.4.0
---

1bce463aca30f9a111ed8f0e8ec0605e01311f89