From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Thu, 29 Oct 2009 22:32:21 +0000 (+0000)
Subject: Merge branch 'master' of http://www.pick.ucam.org/~matthew/irc/
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?p=irc.git;a=commitdiff_plain;h=c33684bedf084f8fffc8649d0009212a89fd853b

Merge branch 'master' of pick.ucam.org/~matthew/irc/
---

c33684bedf084f8fffc8649d0009212a89fd853b