Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Wed, 26 Aug 2015 11:17:10 +0000 (13:17 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 26 Aug 2015 11:17:10 +0000 (13:17 +0200)
commitdcf4c0d6e836ae1bb9a4171ebb8ffd1437fed159
tree681b8ff1cd8a8d5781619f7784573fa6854af7b3
parent4cd38a4aa87b6f3cce874277c445fd0534fbd402
parent81d397fb903984fc238f436815672cf54736ea05
Merge 0.9->0.10
tools/ejabberd2prosody.lua