From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 20 Apr 2008 13:19:37 +0000 (+0100)
Subject: Merge from 3.0 branch
X-Git-Tag: 4.0~117
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/7736e1cc4f9caf63686a425cf716ab54c67647e4

Merge from 3.0 branch
---

7736e1cc4f9caf63686a425cf716ab54c67647e4