From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Mon, 24 May 2010 21:46:31 +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=04c95e26c0984004a8e728c96e12aff0a2fa8f41

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

04c95e26c0984004a8e728c96e12aff0a2fa8f41