diff options
author | Kim Alvefur <zash@zash.se> | 2015-10-02 12:17:41 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-10-02 12:17:41 +0200 |
commit | 6c79c243796faaa674eb591a15257a965b9f30ae (patch) | |
tree | 9a269b858beb01aa83fc44fbceaf5ac72b7bd6fc /COPYING | |
parent | 6867b873ba4863cbcefc937611a1e1233caac550 (diff) | |
parent | a1b1932a9a385bd2d576b1a39b4931ca04171ce2 (diff) | |
download | prosody-6c79c243796faaa674eb591a15257a965b9f30ae.tar.gz prosody-6c79c243796faaa674eb591a15257a965b9f30ae.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions