# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1274366693 -3600
# Node ID 4f4d9834595229f9be9d41276bdf4789205b11d6
# Parent  a698d64fc9292e1c0ab9b0015b5f336de587fc45# Parent  ff9790b827b72379751b90815bfb47b61df29669
Merge with Chris

diff -r a698d64fc929 -r 4f4d98345952 plugins/tell.lua
--- a/plugins/tell.lua	Thu May 20 14:37:28 2010 +0100
+++ b/plugins/tell.lua	Thu May 20 15:44:53 2010 +0100
@@ -21,16 +21,16 @@
 					tellings[nick] = {};
 				end
 				tellings[nick][#tellings[nick] + 1] = {from=command.sender.nick, msg=msg};
-				return "Ok! Will tell " .. nick .. " what you have said!";
+				return "Ok!";
 			else
 				if nick == command.sender.nick then
-					return "Are you going crazy!? You are " .. nick .. "!";
+					return ""Tell yourself.";
 				else
-					return "Aehm?! ... " .. nick .. " is currently online!";
+					return "" .. nick .. " is currently online!";
 				end
 			end
 		else
-			return "Sorry, but this command only makes sense if you execute it in a groupchat.";
+			return "This command is only available in groupchats.";
 		end
 	end);
 
@@ -40,6 +40,7 @@
 				for _,msg in ipairs(tellings[occupant.nick]) do
 					room:send_message(occupant.nick .. ": Welcome back! " .. msg.from .. " told me, to tell you, \"" .. msg.msg .. "\".");
 				end
+				tellings[occupant.nick] = nil;
 			end
 		end);
 	end);