From: Richard Kettlewell <rjk@terraraq.org.uk>
Date: Sun, 31 Jul 2011 16:07:14 +0000 (+0100)
Subject: Merge branch 'branch-5.0' into release
X-Git-Tag: 5.0.3~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/2276db5f9b70a9c7cf9768bdbf6f1cf9b93951b8

Merge branch 'branch-5.0' into release
---

2276db5f9b70a9c7cf9768bdbf6f1cf9b93951b8