diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-07-19 15:36:31 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-07-19 15:36:31 +0100 |
commit | 8ff644f2d3ae1e860396b211d9185a640f96cd73 (patch) | |
tree | 98bb2c521888e4c1af567103a1936cc33c5dc880 /prosody | |
parent | 08553fc31ba154e7cabbd2c0540a12248a1924b4 (diff) | |
parent | f4719b66bc5ed4391b93fb5931a256c1b21fbf1a (diff) | |
download | prosody-8ff644f2d3ae1e860396b211d9185a640f96cd73.tar.gz prosody-8ff644f2d3ae1e860396b211d9185a640f96cd73.zip |
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions