diff options
author | Kim Alvefur <zash@zash.se> | 2015-09-25 18:11:24 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-09-25 18:11:24 +0200 |
commit | 3d29bb52de30cc4662a167d2cdab046c7d642b74 (patch) | |
tree | acb98cdf0005d65cefb429affb0e7d9d11cf37f7 /prosody | |
parent | c77e828701faec6e9d1321a57440453e868ab9a0 (diff) | |
parent | a10c1e367fdd3fd641596b4276765c0286ca3ea0 (diff) | |
download | prosody-3d29bb52de30cc4662a167d2cdab046c7d642b74.tar.gz prosody-3d29bb52de30cc4662a167d2cdab046c7d642b74.zip |
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions