# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1365429916 -3600
# Node ID 30ab4e69a50d5547267a531a2f51fc4d77346131
# Parent  e66973c81e89dcdbc3546b5f2dc9f9041571ccc6# Parent  92615cfa227064d99f9008d03c2d7dad9ad9f75b
Merge 0.9->trunk

diff -r e66973c81e89 -r 30ab4e69a50d plugins/mod_pubsub.lua
--- a/plugins/mod_pubsub.lua	Mon Apr 08 12:08:34 2013 +0100
+++ b/plugins/mod_pubsub.lua	Mon Apr 08 15:05:16 2013 +0100
@@ -22,6 +22,7 @@
 	local origin, stanza = event.origin, event.stanza;
 	local pubsub = stanza.tags[1];
 	local action = pubsub.tags[1];
+	if not action then return; end
 	local handler = handlers[stanza.attr.type.."_"..action.name];
 	if handler then
 		handler(origin, stanza, action);