From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 13 Jul 2008 16:54:07 +0000 (+0100)
Subject: Merge from Disobedience branch
X-Git-Tag: 4.2~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/7f824aad72d99e320abc9aee722242c693c07579

Merge from Disobedience branch
---

7f824aad72d99e320abc9aee722242c693c07579