From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 8 Mar 2009 14:01:44 +0000 (+0000)
Subject: Merge configuration fixes
X-Git-Tag: 5.0~178^2~8
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/67895023d60fc492720d2f575045ed0173948947

Merge configuration fixes
---

67895023d60fc492720d2f575045ed0173948947