From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Fri, 5 Mar 2010 17:50:40 +0000 (+0000)
Subject: Merge branch 'master' of /home/matthew/programming/irc/bot/
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=commitdiff_plain;h=c89928a5d8900e93c265c3bcdcd01cfc43c12ad9;p=irc.git

Merge branch 'master' of /home/matthew/programming/irc/bot/
---

c89928a5d8900e93c265c3bcdcd01cfc43c12ad9