aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-22 17:08:09 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-22 17:08:09 +0100
commitacdcd2b37388a3596c25c2d4c6bc802094a58dec (patch)
tree2593981ba2580f7c824501dc13223411d34fab49 /prosody
parent546db4be6d3e112193599d4bb8cc062003d3cd7b (diff)
parent193ea4ef3030ab24da31f86031f6ea8386331099 (diff)
downloadprosody-acdcd2b37388a3596c25c2d4c6bc802094a58dec.tar.gz
prosody-acdcd2b37388a3596c25c2d4c6bc802094a58dec.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions