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

diff --git a/flirts b/flirts
index 697cc14eeb5f09b1572a4651b6fe1d83b390e380..b90986c68f97bd93cbb76d1eb45be130e57a9da0 100644 (file)
--- a/flirts
+++ b/flirts
@@ -69,3 +69,4 @@ puts %s on top of the Christmas tree
 writes flirts just for %s
 thinks %s is the new hotness
 imagines %s in a sailor outfit
+would like to cause earthquakes with %s

diff --git a/trouts b/trouts
index bd1d2961741c4c77c553f34273654275e955e5f1..8c7bf462e488eedb87e34f97e224b9ebeb59a007 100644 (file)
--- a/trouts
+++ b/trouts
@@ -196,3 +196,5 @@ sends %s on an adventure holiday organised by Weyland-Yutani
 thous %s
 puts potato eyes down %s's shirt
 invites the Shame Orb to %s's party
+recommends the closure of airspace downwind of %s
+flies %s through a cloud of volcanic ash