From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Fri, 8 Jan 2010 14:28:12 +0000 (+0000)
Subject: Merge branch 'master' of /home/matthew/programming/irc/bot/
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=commitdiff_plain;h=2b51ccfe404e12279ef774813161097f4045207a;p=irc.git

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

2b51ccfe404e12279ef774813161097f4045207a
diff --cc trouts
index c0d4d8c,c8b02cc..2d08454
--- a/trouts
+++ b/trouts
@@@ -181,4 -182,6 +181,5 @@@ forces %s to listen to David Cameron's 
  sticks %s in a small room with Ian Paisley
  rains she-trolls down upon %s
  rains wheelbarrows on %s
 -nominates %s for the UK Usenet Committee
  hits %s with a replica of Milan cathedral
+ has %s transported to Botany Bay