# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1323099545 0
# Node ID 05acf08d2e98cda314037263f4be4af7b3fcdfbd
# Parent  816b8ccb30824965044d3f794f8f60c36c538fd1# Parent  94b1d9863dd99d2bdb9507f7285a310e9ae4388f
Merge with Zash

diff -r 94b1d9863dd9 -r 05acf08d2e98 init.lua
--- a/init.lua	Mon Dec 05 16:24:13 2011 +0100
+++ b/init.lua	Mon Dec 05 15:39:05 2011 +0000
@@ -19,6 +19,17 @@
 
 verse.plugins = {};
 
+function verse.init(...)
+	for i=1,select("#", ...) do
+		local ok = pcall(require, "verse."..select(i,...));
+		if not ok then
+			error("Verse connection module not found: verse."..select(i,...));
+		end
+	end
+	return verse;
+end
+
+
 local max_id = 0;
 
 function verse.new(logger, base)
diff -r 94b1d9863dd9 -r 05acf08d2e98 plugins/groupchat.lua
--- a/plugins/groupchat.lua	Mon Dec 05 16:24:13 2011 +0100
+++ b/plugins/groupchat.lua	Mon Dec 05 15:39:05 2011 +0000
@@ -149,6 +149,7 @@
 	local presence = verse.presence({type="unavailable"});
 	if message then
 		presence:tag("status"):text(message);
+	end
 	self:send(presence);
 end