aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-09-19 12:14:08 +0100
committerMatthew Wild <mwild1@gmail.com>2012-09-19 12:14:08 +0100
commitfc11c75968dab816534939aafb2378dcd052c5e5 (patch)
treecf7a08a965f0bb9816285dcc830a140b62fc0ab1 /prosody
parent5f27e2a04037afdb5da8ef53b88ffa7b25014e32 (diff)
parentec41d90e0f1dd90bf7908acbf5ab25301dec9519 (diff)
downloadprosody-fc11c75968dab816534939aafb2378dcd052c5e5.tar.gz
prosody-fc11c75968dab816534939aafb2378dcd052c5e5.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions