From: Matthew Vernon Date: Fri, 5 Mar 2010 17:50:40 +0000 (+0000) 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=c89928a5d8900e93c265c3bcdcd01cfc43c12ad9;hp=4e951eae43f65f7f16f3126053a2fc2b24056806 Merge branch 'master' of /home/matthew/programming/irc/bot/ --- diff --git a/trouts b/trouts index 7236dcd..f778295 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