From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sat, 28 Nov 2009 11:11:17 +0000 (+0000)
Subject: Merge scratch fixes branch
X-Git-Tag: 5.0~34
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/4908c9d03361e2454ce407a9705c2ab9d7140b33?hp=-c

Merge scratch fixes branch
---

4908c9d03361e2454ce407a9705c2ab9d7140b33