diff options
author | Kim Alvefur <zash@zash.se> | 2016-04-19 17:30:30 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-04-19 17:30:30 +0200 |
commit | 3b521bff4ebef687881d8f5f989f3148eaf118d3 (patch) | |
tree | 3edde11b7c7da47a785d5aeb95b6b3510baf56d2 /prosody | |
parent | 75be55d7bd43bb415847f3e871bb81c8699a2967 (diff) | |
parent | 0d34359c3e86b431aad543d4b5bc3f79df64a687 (diff) | |
download | prosody-3b521bff4ebef687881d8f5f989f3148eaf118d3.tar.gz prosody-3b521bff4ebef687881d8f5f989f3148eaf118d3.zip |
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions