# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1586787279 -7200
# Node ID 3ddc7c9f35dc40e5b303af1380778de2b2f20aaf
# Parent  977c9883f625b6765b7c31addf656fcefbd9b6d7# Parent  3a1b1d3084fb001d26dcc53d537c7f344c47500e
Merge 0.11->trunk

diff -r 977c9883f625 -r 3ddc7c9f35dc core/certmanager.lua
diff -r 977c9883f625 -r 3ddc7c9f35dc util/prosodyctl.lua