aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-09-13 18:49:25 +0100
committerMatthew Wild <mwild1@gmail.com>2012-09-13 18:49:25 +0100
commit5f27e2a04037afdb5da8ef53b88ffa7b25014e32 (patch)
treebb4cdcf32285e8fd61bdfbf98ef8402bea2f4ff4 /prosody
parent43bafec7c398173680268f97238736c04aeb8bba (diff)
parent839c9a8ac91ab73176e471c641cdc9e43272520c (diff)
downloadprosody-5f27e2a04037afdb5da8ef53b88ffa7b25014e32.tar.gz
prosody-5f27e2a04037afdb5da8ef53b88ffa7b25014e32.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions