diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-15 02:27:43 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-15 02:27:43 +0200 |
commit | c9db076c158fec5a67bc3830a3fb7718cbd61c54 (patch) | |
tree | 3d260468008647fb5c3339b9fbbba5b2edc51610 /COPYING | |
parent | d64532bd722c65d12ba3f1e76c266fdbe921fe8a (diff) | |
parent | 2e1a6cd73ece566c4ebaf76b0b997e7fddf67fd6 (diff) | |
download | prosody-c9db076c158fec5a67bc3830a3fb7718cbd61c54.tar.gz prosody-c9db076c158fec5a67bc3830a3fb7718cbd61c54.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions