aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-02-06 10:55:09 +0100
committerKim Alvefur <zash@zash.se>2014-02-06 10:55:09 +0100
commit6d743a0544280a231a08d8ab6aeedf9d57090c2a (patch)
tree3064e12f6513a9f471d36bf905f4723a7aa3e292 /doc
parent7a257adaffd2bc14ac33045c4563d428b41d69cb (diff)
parent73f394eec544993923ba0b1bbd4eed78051bd59f (diff)
downloadprosody-6d743a0544280a231a08d8ab6aeedf9d57090c2a.tar.gz
prosody-6d743a0544280a231a08d8ab6aeedf9d57090c2a.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions