# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1469788456 -7200
# Node ID 02b3ea42265b529438a32932383b0a425c42a371
# Parent  f14094d109254e92a55f5790a8e9f636a8802a14# Parent  2db68d1a6eeb2a7c6c250a9ab773d71438f3ca80
Merge 0.10->trunk

diff -r f14094d10925 -r 02b3ea42265b core/certmanager.lua
--- a/core/certmanager.lua	Thu Jul 28 09:39:50 2016 +0100
+++ b/core/certmanager.lua	Fri Jul 29 12:34:16 2016 +0200
@@ -33,7 +33,7 @@
 
 local prosody = prosody;
 local resolve_path = require"util.paths".resolve_relative_path;
-local config_path = prosody.paths.config;
+local config_path = prosody.paths.config or ".";
 
 local luasec_major, luasec_minor = ssl._VERSION:match("^(%d+)%.(%d+)");
 local luasec_version = tonumber(luasec_major) * 100 + tonumber(luasec_minor);