aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-04-06 14:48:00 +0100
committerMatthew Wild <mwild1@gmail.com>2011-04-06 14:48:00 +0100
commit3c24676c15c7426a49d8918482afc0fa1111452f (patch)
tree3a7b4f0cea8b5c8004464c99f02a175546c843d3 /prosody
parentdc08b9834f4d9e00a204fe00b9e547924e0908e5 (diff)
parent2d8a08de123cb93d21bd7015d90b8e5887e2ed54 (diff)
downloadprosody-3c24676c15c7426a49d8918482afc0fa1111452f.tar.gz
prosody-3c24676c15c7426a49d8918482afc0fa1111452f.zip
Merge 0.8->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions