diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-06-12 02:47:53 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-06-12 02:47:53 +0100 |
commit | 87299a523d8d61e7fb838b2e377d3a0beb5b434a (patch) | |
tree | 986567d378b68a194e49c780a06ac427f82054bc /COPYING | |
parent | 06982adcd24eabee31abcebc167411430697d55a (diff) | |
parent | f6135103297c11494f2ce193bffb3770ce07c61f (diff) | |
download | prosody-87299a523d8d61e7fb838b2e377d3a0beb5b434a.tar.gz prosody-87299a523d8d61e7fb838b2e377d3a0beb5b434a.zip |
Merge 0.7->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions