diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-06-26 21:40:33 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-06-26 21:40:33 +0100 |
commit | 60059d543ff5cb323d6c190a7e729404ad22aad4 (patch) | |
tree | 9548ec2afd46a0329a4d86e704ebc03a59f84502 /COPYING | |
parent | 74d66c5aef7a842ddc13a87745c86b8250173655 (diff) | |
parent | 3ad5836d2e94c5399f5291f787ba113e19c9cb40 (diff) | |
download | prosody-60059d543ff5cb323d6c190a7e729404ad22aad4.tar.gz prosody-60059d543ff5cb323d6c190a7e729404ad22aad4.zip |
Merge 0.9->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions