Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Tue, 25 Mar 2014 18:16:38 +0000 (19:16 +0100)
committerKim Alvefur <zash@zash.se>
Tue, 25 Mar 2014 18:16:38 +0000 (19:16 +0100)
commitbf5030942e1e307ad7aa9f4c393b6eb3d8b5fbed
treee70a5397364005bf1c1fb22082ab77c13759aa2d
parent0f35b9c5902ddee26ce743a5d88a82ece793614f
parentddd3f4647ab8a25dc92823d60ac3c77ec99aabb6
Merge 0.9->0.10
core/modulemanager.lua
plugins/mod_saslauth.lua
prosodyctl