merge branch rjkmaster

diff --git a/flirts b/flirts
index 7f0a43814b6322707b4596a3993f7e3e1e2df913..697cc14eeb5f09b1572a4651b6fe1d83b390e380 100644 (file)
--- a/flirts
+++ b/flirts
@@ -64,3 +64,8 @@ wonders whether %s comes here often?
 compares %s to a summer's day
 curls up at %s's feet
 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
+imagines %s in a sailor outfit

diff --git a/slashes b/slashes
index ce6117c9c2738326372f7c1f5da8a1d98c731860..ce4d07bfa01aaebdebaca6764baed44a8875ffc3 100644 (file)
--- a/slashes
+++ b/slashes
@@ -31,3 +31,4 @@ gets ideas for new slashes from watching %s and %s
 thinks %s and %s form a twisted pair
 threatens to expose %s and %s's illicit affair if they don't pay up
 lends %s and %s a copy of the "Kama Sutra"
+shows drawings of %s naked to %s

diff --git a/trouts b/trouts
index ccbbae96d82bb71f743e11868ccb7b116f701d34..b28335c5d4cb64ce0eab120613edacc110af0e36 100644 (file)
--- a/trouts
+++ b/trouts
@@ -95,7 +95,6 @@ throws a cat at %s
 kidnaps %s and fills their shoes with custard
 plays Britney Spears songs at %s
 fills %s's ears with butter
-inverts %s
 throws %s to the lions
 sacrifices %s for the greater good
 patents %s's genome
@@ -152,7 +151,6 @@ compiles %s with -trigraphs
 compiles %s with -Wtrigraphs
 turns %s into dogfood
 ><> ><> %s
-sets %s and robhu up on a blind date
 gently taps %s with a menhir
 invests all of %s's money in a high-grade structured credit strategy enhanced leverage fund
 plays the viola at %s
@@ -180,3 +178,21 @@ deports %s
 thinks %s is even less relevant than Nick Clegg
 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
+sneezes all over %s
+speculatively executes %s
+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
+press-gangs %s
+feeds %s fugu kimo
+sends %s on an adventure holiday organised by Weyland-Yutani
+thous %s
+puts potato eyes down %s's shirt