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: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=commitdiff_plain;h=2b51ccfe404e12279ef774813161097f4045207a;hp=da09f881940535cf9a9e34e80f17bb862cc46248;p=irc.git

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

diff --git a/trouts b/trouts
index c0d4d8c..2d08454 100644
--- a/trouts
+++ b/trouts
@@ -182,3 +182,4 @@ sticks %s in a small room with Ian Paisley
 rains she-trolls down upon %s
 rains wheelbarrows on %s
 hits %s with a replica of Milan cathedral
+has %s transported to Botany Bay