From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Wed, 2 Jul 2008 17:58:29 +0000 (+0100)
Subject: Merge from Disobedience branch
X-Git-Tag: 4.2~9
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/e7b9569145b3469f9487ac31155410cd2d982a3c

Merge from Disobedience branch
---

e7b9569145b3469f9487ac31155410cd2d982a3c