From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Tue, 12 Jan 2010 16:47:02 +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=50a393d1d0af65a1f13f59dfb187a9ccfed557f4;p=irc.git

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

50a393d1d0af65a1f13f59dfb187a9ccfed557f4