From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Wed, 21 Apr 2010 08:48:29 +0000 (+0100)
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=50676a635b08875bcd6c94b23c9e1909b7675703;p=irc.git

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

50676a635b08875bcd6c94b23c9e1909b7675703