Merge 0.10->trunk

2 files changed, 3 insertions, 3 deletions

diff --git a/util/dependencies.lua b/util/dependencies.lua
index a644c395..b093e6cf 100644
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -136,7 +136,7 @@ local function check_dependencies()
 end
 
 local function log_warnings()
-	if _VERSION > "Lua 5.1" then
+	if _VERSION > "Lua 5.2" then
 		prosody.log("warn", "Support for %s is experimental, please report any issues", _VERSION);
 	end
 	local ssl = softreq"ssl";
diff --git a/util/helpers.lua b/util/helpers.lua
index bf76d258..eb38f653 100644
--- a/util/helpers.lua
+++ b/util/helpers.lua
@@ -43,14 +43,14 @@ local function show_events(events, specific_event)
 	local event_handlers = events._handlers;
 	local events_array = {};
 	local event_handler_arrays = {};
-	for event in pairs(events._event_map) do
+	for event, priorities in pairs(events._event_map) do
 		local handlers = event_handlers[event];
 		if handlers and (event == specific_event or not specific_event) then
 			table.insert(events_array, event);
 			local handler_strings = {};
 			for i, handler in ipairs(handlers) do
 				local upvals = debug.string_from_var_table(debug.get_upvalues_table(handler));
-				handler_strings[i] = "  "..i..": "..tostring(handler)..(upvals and ("\n        "..upvals) or "");
+				handler_strings[i] = "  "..priorities[handler]..": "..tostring(handler)..(upvals and ("\n        "..upvals) or "");
 			end
 			event_handler_arrays[event] = handler_strings;
 		end