diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-05-18 00:47:06 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-05-18 00:47:06 +0100 |
commit | e7abee25d8a3175fa14a02b21ba9c14c54e9fcef (patch) | |
tree | d3de45bf9d8a085f149e5e7e8f6d950b3771634e /prosody | |
parent | 08ace7b7890a0c19a5cd5cf155df25e95d47e44a (diff) | |
parent | c9d2da2b2c17c4856588936ab484c1decc314fd9 (diff) | |
download | prosody-e7abee25d8a3175fa14a02b21ba9c14c54e9fcef.tar.gz prosody-e7abee25d8a3175fa14a02b21ba9c14c54e9fcef.zip |
Merge 0.6->0.7
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions