From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Mon, 24 May 2010 21:46:31 +0000 (+0100)
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=04c95e26c0984004a8e728c96e12aff0a2fa8f41;hp=-c;p=irc.git

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

04c95e26c0984004a8e728c96e12aff0a2fa8f41
diff --combined trouts
index 862945d,5c599f2..7b838c2
--- a/trouts
+++ b/trouts
@@@ -180,6 -180,7 +180,6 @@@ 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
  petitions the PM to abolish %s
@@@ -201,3 -202,5 +201,5 @@@ flies %s through a cloud of volcanic as
  buggers a weasel with %s
  posts %s a bobcat
  disestablishes %s
+ sets %s on fire
+ creates an "I hate %s" group on Facebook