diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-06-07 13:23:04 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-06-07 13:23:04 +0100 |
commit | ee940bd4e5b8b0f3a3792422d9e93c9dba8b0126 (patch) | |
tree | 8c171b87d046de6763e46609d1fe5f4af3d04e40 /core | |
parent | 94cef42f727ed438ac4ca938a5b6d5a04577aba5 (diff) | |
parent | 3d65d794a042aa82bbfd1766b616498aba97bdc5 (diff) | |
download | prosody-ee940bd4e5b8b0f3a3792422d9e93c9dba8b0126.tar.gz prosody-ee940bd4e5b8b0f3a3792422d9e93c9dba8b0126.zip |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions