aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-05 17:41:57 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-05 17:41:57 +0100
commitb0282b758f6d2abaeb9d3ead0dc9e04c3ad13430 (patch)
tree205747ed5581214de833dac66288a24b65368e6c /doc
parent2429531070ba2f2273a77c3512abbca5acda92ff (diff)
parentff8bd93299b7f9a46a5dc1ff9825ebde7637321e (diff)
downloadprosody-b0282b758f6d2abaeb9d3ead0dc9e04c3ad13430.tar.gz
prosody-b0282b758f6d2abaeb9d3ead0dc9e04c3ad13430.zip
Merge (some of) trunk -> 0.9
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions