From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Mon, 11 Jan 2010 18:21:11 +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=480558b51c54bbed6d63937d2fa87561b861bed0

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

480558b51c54bbed6d63937d2fa87561b861bed0
diff --cc trouts
index 2d08454,3199f54..b22c50f
--- a/trouts
+++ b/trouts
@@@ -181,5 -182,7 +181,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