diff options
author | Kim Alvefur <zash@zash.se> | 2017-02-04 01:08:27 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-02-04 01:08:27 +0100 |
commit | e902bcea2ee39bf7fdeda44d9f28dd8c893084d7 (patch) | |
tree | 300927642fc0f857d9ea96ab4b1e2bc2d4c20950 /prosody | |
parent | f01dafc6febdb8e36bfe475853f8e1d4b6ccf8cd (diff) | |
parent | 0e99534951484e5c1ab98897272c92ea6b13f8ff (diff) | |
download | prosody-e902bcea2ee39bf7fdeda44d9f28dd8c893084d7.tar.gz prosody-e902bcea2ee39bf7fdeda44d9f28dd8c893084d7.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions