aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-06-02 21:34:16 +0100
committerMatthew Wild <mwild1@gmail.com>2010-06-02 21:34:16 +0100
commit27ecf036809bda70b9d279b2bd94a2e7e40dd9c0 (patch)
treeb671d41b5b0f100f4c0ae486e603143bb97338f9 /prosody
parent20cfa07081574070996c626b907644cbf4d37fc2 (diff)
parent3883d8dd070143268b1cb6e9cf09797f3d9868cd (diff)
downloadprosody-27ecf036809bda70b9d279b2bd94a2e7e40dd9c0.tar.gz
prosody-27ecf036809bda70b9d279b2bd94a2e7e40dd9c0.zip
Merge 0.7->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions