diff options
author | Kim Alvefur <zash@zash.se> | 2015-10-11 20:00:15 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-10-11 20:00:15 +0200 |
commit | 7835e7573e12cc36b70110705dd7b5571d26fbb9 (patch) | |
tree | 9dda5118b8049593897f08f728992882604e53f4 /prosody | |
parent | e0c0cf5743fdbadd5220ebadd8511b76d4547c8a (diff) | |
parent | 0dfbace5560dc05a5ddbdb89819efdc9ae9ae0e3 (diff) | |
download | prosody-7835e7573e12cc36b70110705dd7b5571d26fbb9.tar.gz prosody-7835e7573e12cc36b70110705dd7b5571d26fbb9.zip |
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions