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

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

fdb7f1da040bcb4ec3e688c670b53227b000d235