From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Wed, 20 Jan 2010 18:45:19 +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=69329b7bb044fe862255511725d0dd1720a21198;p=irc.git

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

69329b7bb044fe862255511725d0dd1720a21198