From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Fri, 23 Apr 2010 14:02:41 +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=6c959013bb4658c2393a7428710ce8570b2032b6;p=irc.git

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

6c959013bb4658c2393a7428710ce8570b2032b6