From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Wed, 24 Feb 2010 14:57:30 +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=ee428a7e2ece4b67031278b9e73e2602af698471;p=irc.git

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

ee428a7e2ece4b67031278b9e73e2602af698471