From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Wed, 7 Apr 2010 14:52:18 +0000 (+0100)
Subject: merge branch rjkmaster
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=commitdiff_plain;h=36e79f1611b8f3c2ecc7e532285c28cbd2a2d66c;p=irc.git

merge branch rjkmaster
---

36e79f1611b8f3c2ecc7e532285c28cbd2a2d66c