aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-05-05 17:22:43 +0100
committerMatthew Wild <mwild1@gmail.com>2010-05-05 17:22:43 +0100
commit28942eed12a9d77431cf4b78814deb63356c751a (patch)
tree5fb75594be09f8b1842028d282e90a0ed19a669c /doc
parent1dce4a3033300f40a4b74b286162bab34337f9bb (diff)
parent4af6813db9ffa6dcacd2eb20417ca4667159f9af (diff)
downloadprosody-28942eed12a9d77431cf4b78814deb63356c751a.tar.gz
prosody-28942eed12a9d77431cf4b78814deb63356c751a.zip
Merge 0.7->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions