Kim Alvefur <zash@zash.se> [Mon, 08 Feb 2016 20:23:12 +0100] rev 7152
mod_storage_sql: Support non-string keys in map store
Matthew Wild <mwild1@gmail.com> [Mon, 08 Feb 2016 21:50:04 +0000] rev 7151
Merge
Thomas Gstädtner <thomas@gstaedtner.net> [Mon, 08 Feb 2016 14:48:50 +0100] rev 7150
prosodyctl: fix CnP bug in deluser output
Kim Alvefur <zash@zash.se> [Fri, 05 Feb 2016 16:31:34 +0100] rev 7149
Merge 0.10->trunk
Kim Alvefur <zash@zash.se> [Fri, 05 Feb 2016 16:12:01 +0100] rev 7148
certmanager: Try filename.key if certificate is set to a full filename ending with .crt
Kim Alvefur <zash@zash.se> [Fri, 05 Feb 2016 15:03:39 +0100] rev 7147
certmanager: Apply global ssl config later so certificate/key is not overwritten by magic
Matthew Wild <mwild1@gmail.com> [Fri, 05 Feb 2016 00:10:46 +0000] rev 7146
hostmanager: Remove unused imports of 'jid_split' and 'select'
Matthew Wild <mwild1@gmail.com> [Fri, 05 Feb 2016 00:10:27 +0000] rev 7145
moduleapi: Silence luacheck warning about unused 'id' parameter
Matthew Wild <mwild1@gmail.com> [Fri, 05 Feb 2016 00:04:11 +0000] rev 7144
Merge 0.10->trunk
Matthew Wild <mwild1@gmail.com> [Fri, 05 Feb 2016 00:03:41 +0000] rev 7143
certmanager: Support new certificate configuration for non-XMPP services too (fixes #614)