From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 20 Apr 2008 19:17:45 +0000 (+0100)
Subject: Merge from 3.0 fixes branch
X-Git-Tag: 5.0.3~122
X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/commitdiff_plain/7378b5081fde6f48140327d5c072a8231934f027?hp=7378b5081fde6f48140327d5c072a8231934f027

Merge from 3.0 fixes branch
---