From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Tue, 30 Mar 2010 17:13:06 +0000 (+0100)
Subject: Merge branch 'master' of /home/matthew/programming/irc/bot/
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?p=irc.git;a=commitdiff_plain;h=fdb7f1da040bcb4ec3e688c670b53227b000d235;hp=d163959416fc2dacf0fe595da17d685c5691a7b1

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

diff --git a/trouts b/trouts
index b28335c..5d83db2 100644
--- a/trouts
+++ b/trouts
@@ -180,7 +180,6 @@ forces %s to listen to David Cameron's speeches
 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