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

diff --git a/flirts b/flirts
index ca30844310186a282fac7680a3a0ce70187804b4..002aa80a1f85d1e6b7fd09373f095c9c72a57307 100644 (file)
--- a/flirts
+++ b/flirts
@@ -67,3 +67,4 @@ plays %s's theme tune
 sends for %s and more golden syrup
 puts %s on top of the Christmas tree
 writes flirts just for %s
+thinks %s is the new hotness

diff --git a/trouts b/trouts
index 633d38d324a7c7b9bd7ac88fb7bdc1cf7e89db31..0c4c3d9bb69504561a0edf7cb896af96781cdcd3 100644 (file)
--- a/trouts
+++ b/trouts
@@ -190,3 +190,4 @@ screams and leaps at %s
 hits %s with a cockatrice corpse
 sets %s up on a blind date with Jonathan Ross and Russell Brand
 gives %s a hard stare
+neuralyzes %s