From: rjk@greenend.org.uk <>
Date: Fri, 23 Nov 2007 14:39:56 +0000 (+0000)
Subject: merge from disorder.dev
X-Git-Tag: debian-1_5_99dev9~1^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/346bd0cf4e8fb8ead2ad5b59fd9a628c8592e1ee

merge from disorder.dev
---

346bd0cf4e8fb8ead2ad5b59fd9a628c8592e1ee