diff options
author | Kim Alvefur <zash@zash.se> | 2016-05-04 16:58:25 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-05-04 16:58:25 +0200 |
commit | 32be089091c4303c5dabccefcfdf8e38cf6d6366 (patch) | |
tree | 4069efefa5eba71585ead8faa0cbe970de5dcecd /COPYING | |
parent | c5f066571103f02b6cd79af59cbc6eec6e7a8aad (diff) | |
parent | 47fb0705f697eef316c115ce1ad736951e31dd34 (diff) | |
download | prosody-32be089091c4303c5dabccefcfdf8e38cf6d6366.tar.gz prosody-32be089091c4303c5dabccefcfdf8e38cf6d6366.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions