diff options
author | Kim Alvefur <zash@zash.se> | 2017-01-28 21:39:14 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-01-28 21:39:14 +0100 |
commit | c5c11c2e2e6d2383ad901d34d417794f65d41679 (patch) | |
tree | 6c9cf0c2b8ff612f448ee3f99ed5f320126989e2 /prosody | |
parent | 4ec8a2f5b5961e90db28d92afd1f685966d8fe42 (diff) | |
parent | b661ee3acae5202256b1cd6492bdd6feac8db8bd (diff) | |
download | prosody-c5c11c2e2e6d2383ad901d34d417794f65d41679.tar.gz prosody-c5c11c2e2e6d2383ad901d34d417794f65d41679.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions