diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-04-07 21:01:06 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-04-07 21:01:06 +0100 |
commit | 27459fad4ba2e40ad09552b61d695dce2f113d40 (patch) | |
tree | c3b8063b9bd334257b09213015fb422c2db35db6 /prosody | |
parent | e0b8ae73c0c3d432aafa5a94b256442e55395ad5 (diff) | |
parent | 90116b3c354d4c48b65e1fb66074e3329bbf4fe0 (diff) | |
download | prosody-27459fad4ba2e40ad09552b61d695dce2f113d40.tar.gz prosody-27459fad4ba2e40ad09552b61d695dce2f113d40.zip |
Merge 0.7->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions