From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Tue, 12 Jan 2010 17:04:58 +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=fab4fadbc205e4f99bf7bcefd436240a5f47ca7b;p=irc.git

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

fab4fadbc205e4f99bf7bcefd436240a5f47ca7b