diff options
author | Kim Alvefur <zash@zash.se> | 2015-12-12 02:33:15 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-12-12 02:33:15 +0100 |
commit | 6fad316b571034aa42a9ffc0a8dc1265e0bd431c (patch) | |
tree | eb25e806fa92c8e2587a429560f50b893ae369f1 /COPYING | |
parent | be2a3acbcdc501f7e6b585f5a5641661fbfa422e (diff) | |
parent | 46fa4549336de1b2f38d35c07bd0a24c866c0f7a (diff) | |
download | prosody-6fad316b571034aa42a9ffc0a8dc1265e0bd431c.tar.gz prosody-6fad316b571034aa42a9ffc0a8dc1265e0bd431c.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions