From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Mon, 1 Feb 2010 17:36:05 +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=407abba7c021cbe50755e42feaee725ca062ceb9;p=irc.git

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

407abba7c021cbe50755e42feaee725ca062ceb9