Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Wed, 26 Feb 2014 21:21:55 +0000 (22:21 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 26 Feb 2014 21:21:55 +0000 (22:21 +0100)
commit80433ad5d309c052274d943269b6d56a7d45cea0
tree5feccd6eaa87d8dfeca0f73e43baa36bb6368edd
parent50f4c7e43e90911576f9e518a766572de2c4667f
parent52283b80d349dc404ce9b3cff2bf58407bd733d1
Merge 0.9->0.10
plugins/mod_http.lua
tools/ejabberd2prosody.lua