From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Fri, 29 Jan 2010 15:35:25 +0000 (+0000)
Subject: Merge branch 'master' of /home/matthew/programming/irc/bot/
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?p=irc.git;a=commitdiff_plain;h=f3022fdd26b133d6e5752c32889074bd7c89a542

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

f3022fdd26b133d6e5752c32889074bd7c89a542