From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Tue, 25 May 2010 14:48:27 +0000 (+0100)
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=cc3978d5c2741a710eaa059c9a967db2df49899f;hp=cc3978d5c2741a710eaa059c9a967db2df49899f

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