diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-06-12 13:55:56 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-06-12 13:55:56 +0100 |
commit | 6dc6c83001b9de3fadb0c4af5742232b80f61ae7 (patch) | |
tree | ad5ef4f0eb8f1738a908ee17ac3301935cca7c43 /core | |
parent | b0dbc823ea3972c0bffa1dd1a17e32aa6d5d0461 (diff) | |
parent | 67cafcb874bf19db469dea76b7e2baf597009c89 (diff) | |
download | prosody-6dc6c83001b9de3fadb0c4af5742232b80f61ae7.tar.gz prosody-6dc6c83001b9de3fadb0c4af5742232b80f61ae7.zip |
Merge with trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions