From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Wed, 21 Apr 2010 13:00:09 +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=3913e49cced107320aa41a8bdbd3eca00e383a70;p=irc.git

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

3913e49cced107320aa41a8bdbd3eca00e383a70