aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-10-14 22:53:41 +0200
committerKim Alvefur <zash@zash.se>2012-10-14 22:53:41 +0200
commitdbac5db2dabdfdb13632b0b64f59d1c2cd2b77c6 (patch)
tree0fcfafb96064def71df05ea9765e4141bfc89a1c /prosody
parent38f89dfe3fb1cff7b6f7dc873881dc439990eb33 (diff)
parent1dad7f3278cab2865dbfe0719b5b3daff853e2c2 (diff)
downloadprosody-dbac5db2dabdfdb13632b0b64f59d1c2cd2b77c6.tar.gz
prosody-dbac5db2dabdfdb13632b0b64f59d1c2cd2b77c6.zip
Merge 0.9 -> trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions