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=0a12186235e721cc5e5595b5f04bc6252d22b6ec;p=irc.git

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

diff --git a/trouts b/trouts
index c8b02cc..2d08454 100644
--- a/trouts
+++ b/trouts
@@ -152,7 +152,6 @@ compiles %s with -trigraphs
 compiles %s with -Wtrigraphs
 turns %s into dogfood
 ><> ><> %s
-sets %s and robhu up on a blind date
 gently taps %s with a menhir
 invests all of %s's money in a high-grade structured credit strategy enhanced leverage fund
 plays the viola at %s
@@ -182,6 +181,5 @@ 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