aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-05-13 22:31:59 +0200
committerKim Alvefur <zash@zash.se>2015-05-13 22:31:59 +0200
commitcedc24858c35741d5131bbf4840d4f83dfb7b9bb (patch)
treea1194a8507fd6aba43f775983a36e82bbb8c2448 /prosody
parent2f7ac943416fa13023e9d061ffc8020811a4ebf0 (diff)
parentecb35aa0e93c449e422fc385e2e2b679b7082b8c (diff)
downloadprosody-cedc24858c35741d5131bbf4840d4f83dfb7b9bb.tar.gz
prosody-cedc24858c35741d5131bbf4840d4f83dfb7b9bb.zip
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions