aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-12-16 23:32:11 +0000
committerMatthew Wild <mwild1@gmail.com>2013-12-16 23:32:11 +0000
commitbcc1c1a7d3db5accfe856b511ef946446b929312 (patch)
tree19fa0823b9f58cbf86368625aef15c98eeb8fe8b /prosody
parent975be94ee27690746706dfc360730ae0fbb8f754 (diff)
parentceba28fe83e3c5692701f22ce1ea4def69271f9e (diff)
downloadprosody-bcc1c1a7d3db5accfe856b511ef946446b929312.tar.gz
prosody-bcc1c1a7d3db5accfe856b511ef946446b929312.zip
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions