aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-02-18 13:49:19 +0000
committerMatthew Wild <mwild1@gmail.com>2016-02-18 13:49:19 +0000
commitb899f5bc37229064d4995ecedde6b8b329db9e3f (patch)
treebc070a843a55e064508fe8efd43fd563bcf9247c /core
parent7e0b29e4e26c0c1f0403f79e85bbb377035502bf (diff)
parent68d19b7be1bb696a565539a87d1149fd5de0bd20 (diff)
downloadprosody-b899f5bc37229064d4995ecedde6b8b329db9e3f.tar.gz
prosody-b899f5bc37229064d4995ecedde6b8b329db9e3f.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
-rw-r--r--core/certmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 978a9efc..a4c9d891 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -25,7 +25,7 @@ local ssl_newcontext = ssl.newcontext;
local new_config = require"util.sslconfig".new;
local stat = require "lfs".attributes;
-local tostring = tostring;
+local tonumber, tostring = tonumber, tostring;
local pairs = pairs;
local type = type;
local io_open = io.open;