aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-03-21 21:05:15 +0000
committerMatthew Wild <mwild1@gmail.com>2016-03-21 21:05:15 +0000
commit576a049e5671ace54176515868e495dfbc5482d3 (patch)
tree77c0be62bfd2bafe4997921739e2ac005754d6d9 /doc
parent1193a4bdb914eba2a902ae5275bd56438bd49b55 (diff)
parent021411faa6e94efde75fa92a3ba3a993cdedf436 (diff)
downloadprosody-576a049e5671ace54176515868e495dfbc5482d3.tar.gz
prosody-576a049e5671ace54176515868e495dfbc5482d3.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions