From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Fri, 8 Jan 2010 18:46:21 +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=048d1a94c187df176654f7e001e2d45ebe7668d7;p=irc.git

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

048d1a94c187df176654f7e001e2d45ebe7668d7