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
commitaa6ac860153d3e5ff9d018beb68b11e187dbdda6 (patch)
tree205747ed5581214de833dac66288a24b65368e6c /doc
parent02dc79e546ce19f54b858c102943ee6d80eec584 (diff)
parent94d42dfe8737ff3b5fe28e56f5b9d7cf0c0a0330 (diff)
downloadprosody-aa6ac860153d3e5ff9d018beb68b11e187dbdda6.tar.gz
prosody-aa6ac860153d3e5ff9d018beb68b11e187dbdda6.zip
Merge (some of) trunk -> 0.9
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions