diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-11-27 21:53:10 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-11-27 21:53:10 +0000 |
| commit | 8392d6598a94e2bcc00686b0524964a387f0834c (patch) | |
| tree | 0dddea33d07935991c8d64e2a18fe049d7bad554 /core | |
| parent | 9bf541574ec9f7a994b176fa10f58f57aee9de17 (diff) | |
| parent | 339e703edd098189b555907065fe76c243d542a1 (diff) | |
| download | prosody-8392d6598a94e2bcc00686b0524964a387f0834c.tar.gz prosody-8392d6598a94e2bcc00686b0524964a387f0834c.zip | |
Merge with trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions