From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
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=ee428a7e2ece4b67031278b9e73e2602af698471

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

diff --git a/trouts b/trouts
index 2b4a0ff..f778295 100644
--- a/trouts
+++ b/trouts
@@ -193,3 +193,4 @@ neuralyzes %s
 press-gangs %s
 feeds %s fugu kimo
 sends %s on an adventure holiday organised by Weyland-Yutani
+thous %s