From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 20 Apr 2008 16:00:19 +0000 (+0100)
Subject: Merge from disorder.userman
X-Git-Tag: 4.0~114
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/159f3470a01211557dcd39f5701dcaf0f43f6683?ds=sidebyside;hp=-c

Merge from disorder.userman
---

159f3470a01211557dcd39f5701dcaf0f43f6683