aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-07-09 00:14:27 +0100
committerMatthew Wild <mwild1@gmail.com>2015-07-09 00:14:27 +0100
commitf1c16522876601ffd9c74af2e6647836150de40c (patch)
treeb1ae5f3567985e99fa359ae10fed5d9fdab85d91 /doc
parent5c4f162797b7f2ba6faa6f9f3ce0ed5db7bee0ad (diff)
parentc38e034cf497a13f5f813b7d5217102ffb3677d9 (diff)
downloadprosody-f1c16522876601ffd9c74af2e6647836150de40c.tar.gz
prosody-f1c16522876601ffd9c74af2e6647836150de40c.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions