aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-11-22 11:53:14 +0100
committerKim Alvefur <zash@zash.se>2014-11-22 11:53:14 +0100
commitb690efb23ea66e96d671fc263aea71413188394f (patch)
tree98623423e23c23564e823ff65f6b5bca51f14de2 /prosody
parent1875a89b0269a92b965298f3ca9f234630e11721 (diff)
parent49ba0ce08dd45d2438ddd1ee14d53da57cb9573e (diff)
downloadprosody-b690efb23ea66e96d671fc263aea71413188394f.tar.gz
prosody-b690efb23ea66e96d671fc263aea71413188394f.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions