aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-20 23:39:45 +0200
committerKim Alvefur <zash@zash.se>2014-04-20 23:39:45 +0200
commit5c9b1e7c12e66e518237b17f26629b7da6198a4c (patch)
tree98ca74d989832843edfb586f3e4c72d65ebd6819 /doc
parent84a60172446e16818f990a3066d38fc08acbc27c (diff)
parentaa3344731d2636073d39c3a2641d02813bd29019 (diff)
downloadprosody-5c9b1e7c12e66e518237b17f26629b7da6198a4c.tar.gz
prosody-5c9b1e7c12e66e518237b17f26629b7da6198a4c.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions