From: Richard Kettlewell <rjk@terraraq.org.uk>
Date: Sun, 31 Jul 2011 11:31:07 +0000 (+0100)
Subject: Merge commit 'ad0c0f361be0'
X-Git-Tag: branchpoint-5.1~38
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/6edfd17ae7012be4f2365f8e84e4a1654fb1fdb6

Merge commit 'ad0c0f361be0'
---

6edfd17ae7012be4f2365f8e84e4a1654fb1fdb6