aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-08-28 12:05:18 +0100
committerMatthew Wild <mwild1@gmail.com>2014-08-28 12:05:18 +0100
commit656d194bd1e0022605ab0a5b66da7ee2c5a3a1d3 (patch)
treef9b41c73e3cda1b1f3ffe63a3921967eea4a20d6 /doc
parentbf66f0049f2e7682ed6354388db92a2b25ea67b6 (diff)
parent878efeecd5030048b33121b05c6cf402f860ca1d (diff)
downloadprosody-656d194bd1e0022605ab0a5b66da7ee2c5a3a1d3.tar.gz
prosody-656d194bd1e0022605ab0a5b66da7ee2c5a3a1d3.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions