From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Wed, 12 May 2010 10:50:45 +0000 (+0100)
Subject: Merge branch 'master' of /home/matthew/programming/irc/bot/
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=commitdiff_plain;h=cd309891e3b8b6058cc4b7aff0eab3d2ebd4776c;p=irc.git

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

cd309891e3b8b6058cc4b7aff0eab3d2ebd4776c