From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Wed, 20 Jan 2010 10:21:01 +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=d116e536819004896f3a98f41d8e33c92b34500b;p=irc.git

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

d116e536819004896f3a98f41d8e33c92b34500b