Merge 0.10->trunk

This commit is contained in:
Kim Alvefur 2016-11-19 01:05:36 +01:00
commit da42ca2167
3 changed files with 5 additions and 7 deletions

View file

@ -136,7 +136,7 @@ local function check_dependencies()
end
local function log_warnings()
if _VERSION > "Lua 5.1" then
if _VERSION > "Lua 5.2" then
prosody.log("warn", "Support for %s is experimental, please report any issues", _VERSION);
end
local ssl = softreq"ssl";