Merge 0.7->trunk

Wed, 26 May 2010 13:38:22 +0100

author
Matthew Wild <mwild1@gmail.com>
date
Wed, 26 May 2010 13:38:22 +0100
changeset 3126
9095eb464260
parent 3124
21e60658767d (current diff)
parent 3125
f2d1079a758d (diff)
child 3128
2eac6dadd9a8

Merge 0.7->trunk

--- a/plugins/mod_groups.lua	Mon May 24 19:46:12 2010 +0100
+++ b/plugins/mod_groups.lua	Wed May 26 13:38:22 2010 +0100
@@ -67,7 +67,9 @@
 				new_roster[jid] = contact;
 			end
 		end
-		new_roster[false].version = nil; -- Version is void
+		if new_roster[false] then
+			new_roster[false].version = nil; -- Version is void
+		end
 		return username, host, datastore, new_roster;
 	end
 

mercurial