From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Mon, 24 May 2010 16:26:43 +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=8d95a1b7fdc8793822e7849bc473fac2ab6bbc0d;hp=03d16980ee69724c2b15cff0aa8cb657b0df82f6;p=irc.git

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

diff --git a/trouts b/trouts
index a860b86..862945d 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