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
commit38d9c9ebddb923482b91361547ee73a6e5f2cbe8 (patch)
treef5037556f62b8874e8a8bd1c42bdcce76b190ffe /doc
parent9c5384c1f1343bf2b8c60623f264869f4f1a0f07 (diff)
parentdbf3c7d1a0b749ab0abe2e2565a7ca70ca8e6a47 (diff)
downloadprosody-38d9c9ebddb923482b91361547ee73a6e5f2cbe8.tar.gz
prosody-38d9c9ebddb923482b91361547ee73a6e5f2cbe8.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions