From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 12 May 2016 17:45:59 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=e675979fa9fbb46c957ffe195f0b757ce0d2c4c4;hp=79348d8a352c2184330e273ba1470f85e5457757;p=prosody.git

Merge 0.10->trunk
---

diff --git a/util/events.lua b/util/events.lua
index 073d2a60..e2943e44 100644
--- a/util/events.lua
+++ b/util/events.lua
@@ -131,7 +131,7 @@ local function new()
 			end
 		end
 		if #w == 0 then
-			if event_name == nil then
+			if event_name == false then
 				global_wrappers = nil;
 			else
 				wrappers[event_name] = nil;