diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-04-09 12:32:25 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-04-09 12:32:25 +0100 |
commit | 8d3d5fb5d7c787738fc863bfba7c48c08c2d12f7 (patch) | |
tree | e6e839537a1fe22c67df5e2ce7a7c29652be2a85 /core | |
parent | 4763db4b4234987de5db3fee47c6e147e9ad3f8a (diff) | |
parent | c802b22a8bb05ab6b9644c1c722bb06b7b16a0ee (diff) | |
download | prosody-8d3d5fb5d7c787738fc863bfba7c48c08c2d12f7.tar.gz prosody-8d3d5fb5d7c787738fc863bfba7c48c08c2d12f7.zip |
Merge 0.7->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions