# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1556900054 -7200
# Node ID 9d6baacdd8e6cf628a2d3fbb2110e0f31dba352e
# Parent  f122972b77b2459f95b634040ae0bfda12bf8e18# Parent  8cd180dc18a85e98383e4655e677c7b5ec5f5eb4
Merge 0.11->trunk

diff -r f122972b77b2 -r 9d6baacdd8e6 prosodyctl
--- a/prosodyctl	Fri May 03 04:10:31 2019 -0700
+++ b/prosodyctl	Fri May 03 18:14:14 2019 +0200
@@ -402,6 +402,7 @@
 	local module_versions, longest_name = {}, 8;
 	local luaevent =dependencies.softreq"luaevent";
 	dependencies.softreq"ssl";
+	dependencies.softreq"DBI";
 	for name, module in pairs(package.loaded) do
 		if type(module) == "table" and rawget(module, "_VERSION")
 		and name ~= "_G" and not name:match("%.") then