aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-05-17 11:58:00 +0100
committerMatthew Wild <mwild1@gmail.com>2010-05-17 11:58:00 +0100
commitdbd6ecb95eae510bd2ae009f9e44c528052f6b19 (patch)
tree3c7bd79f421d02889a064274601202a6b090d0a2 /doc
parent7a03cd0c613168053260e94f763a883519730357 (diff)
parent08ace7b7890a0c19a5cd5cf155df25e95d47e44a (diff)
downloadprosody-dbd6ecb95eae510bd2ae009f9e44c528052f6b19.tar.gz
prosody-dbd6ecb95eae510bd2ae009f9e44c528052f6b19.zip
Merge 0.7->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions