diff options
author | Kim Alvefur <zash@zash.se> | 2013-09-03 13:43:39 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-09-03 13:43:39 +0200 |
commit | 49ac28447067580a77c87266d9a6f3b94191f2ec (patch) | |
tree | d09d7bb967b08c4950f0f241be175d676bf61c2e /prosody | |
parent | 36a07920159d61c0320fd10c8f8b588628c8ff85 (diff) | |
parent | 628910498b1d7c4710fd531cad43b2c21d0e18bb (diff) | |
download | prosody-49ac28447067580a77c87266d9a6f3b94191f2ec.tar.gz prosody-49ac28447067580a77c87266d9a6f3b94191f2ec.zip |
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions