diff options
author | Kim Alvefur <zash@zash.se> | 2014-11-09 20:32:33 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-11-09 20:32:33 +0100 |
commit | 3b5fa59a5496cd0d19e2a0dac067188d61d76c36 (patch) | |
tree | 00a4652d294babdf3be6f9add9a811a0e180a5d8 /COPYING | |
parent | 763567fa0236b0b80e0271ed1d3325501b979ee1 (diff) | |
parent | 486335f3dbc84dacf253120f544f1d2ee026cf94 (diff) | |
download | prosody-3b5fa59a5496cd0d19e2a0dac067188d61d76c36.tar.gz prosody-3b5fa59a5496cd0d19e2a0dac067188d61d76c36.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions