From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Mon, 24 May 2010 16:26:43 +0000 (+0100)
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=8d95a1b7fdc8793822e7849bc473fac2ab6bbc0d;p=irc.git

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

8d95a1b7fdc8793822e7849bc473fac2ab6bbc0d