aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-17 18:08:44 +0100
committerKim Alvefur <zash@zash.se>2016-03-17 18:08:44 +0100
commitb324d49c610e89fb843cd44c4afd52b500cd65b7 (patch)
tree716fb68621be4bcfe9fdb1a11637c9ba21b29f6f /prosody
parent1121d5eaced1fe90aafe5ce25fda73bbd4779def (diff)
parent74f29daa298868c7c34f3e6d9fa5e6c18a296bdb (diff)
downloadprosody-b324d49c610e89fb843cd44c4afd52b500cd65b7.tar.gz
prosody-b324d49c610e89fb843cd44c4afd52b500cd65b7.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions