aboutsummaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-10 13:16:54 +0200
committerKim Alvefur <zash@zash.se>2014-04-10 13:16:54 +0200
commit87020b4789013b1d8ff33d7929d455392b1d9638 (patch)
tree521b9634144ac84ea608dbe47a15a0bcd1951695 /man
parent35ef31bd9b827f325f17180dfa77a66578df0983 (diff)
parentae8a4fb909a0cce10a12e9ced65e45ef2d1495fa (diff)
downloadprosody-87020b4789013b1d8ff33d7929d455392b1d9638.tar.gz
prosody-87020b4789013b1d8ff33d7929d455392b1d9638.zip
Merge 0.10->trunk
Diffstat (limited to 'man')
0 files changed, 0 insertions, 0 deletions