aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-06-26 21:40:33 +0100
committerMatthew Wild <mwild1@gmail.com>2013-06-26 21:40:33 +0100
commit9f3c9da2c265910b4878cf20d61be15bc033354f (patch)
tree9548ec2afd46a0329a4d86e704ebc03a59f84502 /prosody
parentb091e0eef151b2ad76d3efa0d3f791e07879d623 (diff)
parent871b368671e526a8b32494b6129443ae0b666ce8 (diff)
downloadprosody-9f3c9da2c265910b4878cf20d61be15bc033354f.tar.gz
prosody-9f3c9da2c265910b4878cf20d61be15bc033354f.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions