From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Fri, 12 Feb 2010 23:41:28 +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=1d857a3f13a1b8a870326dc4bc6bc6f3bf4916a5;p=irc.git

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

1d857a3f13a1b8a870326dc4bc6bc6f3bf4916a5