diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-11-22 15:52:10 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-11-22 15:52:10 +0000 |
commit | c9af381fcea7a38807fb51685157798add05ec61 (patch) | |
tree | 3e427379d7463fcf546ddc9318100d488a5d5908 /prosody | |
parent | dc786b603f38d2ed33ec00133689fdd27aae3db5 (diff) | |
parent | ad798d75d804d76c0651d25739655f5651c30f95 (diff) | |
download | prosody-c9af381fcea7a38807fb51685157798add05ec61.tar.gz prosody-c9af381fcea7a38807fb51685157798add05ec61.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions