From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Wed, 27 Jan 2010 10:30:47 +0000 (+0000)
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=3b59e4dfa86b81a1670d4e2f8b82cf31decfb271;p=irc.git

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

3b59e4dfa86b81a1670d4e2f8b82cf31decfb271