Merge 0.10->trunk

1 files changed, 4 insertions, 1 deletions

diff --git a/prosodyctl b/prosodyctl
index ef62a9d8..e118502c 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -590,8 +590,11 @@ function commands.about(arg)
 			module_versions[name] = module._VERSION;
 		end
 	end
+	if luaevent then
+		module_versions["libevent"] = luaevent.core.libevent_version();
+	end
 	local sorted_keys = array.collect(keys(module_versions)):sort();
-	for _, name in ipairs(array.collect(keys(module_versions)):sort()) do
+	for _, name in ipairs(sorted_keys) do
 		print(name..":"..string.rep(" ", longest_name-#name), module_versions[name]);
 	end
 	print("");