aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-27 01:02:54 +0200
committerKim Alvefur <zash@zash.se>2014-04-27 01:02:54 +0200
commit2f70dc87b20dbfbac10f637b1ed8c5619699a663 (patch)
treef5037556f62b8874e8a8bd1c42bdcce76b190ffe /doc
parent0f7452e6a709099cc722d9e7b6484b2cb12a417d (diff)
parentf282f95465683073ef4c5a3d8fd2646eb8a8effe (diff)
downloadprosody-2f70dc87b20dbfbac10f637b1ed8c5619699a663.tar.gz
prosody-2f70dc87b20dbfbac10f637b1ed8c5619699a663.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions