From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Thu, 15 Oct 2009 19:55:55 +0000 (+0100)
Subject: Merge from trunk
X-Git-Tag: 5.0~86^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/61b761862db3feb9bd0135a64ac3729f70917f89?hp=-c

Merge from trunk
---

61b761862db3feb9bd0135a64ac3729f70917f89