Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Thu, 10 Apr 2014 11:15:11 +0000 (13:15 +0200)
committerKim Alvefur <zash@zash.se>
Thu, 10 Apr 2014 11:15:11 +0000 (13:15 +0200)
commit0f16692963e73a392fb9fc930e3dd02373c3a6e3
treed511d48ec97339a2c75a38245cd8cf68a5bb996c
parent5467d027ba0df940a0a435795417e6f48e289f5e
parente66d4e440fcd1f70bc5f169698f6cf51eca66c5f
Merge 0.9->0.10
plugins/mod_admin_telnet.lua
prosody
util/dependencies.lua