aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-04-19 16:16:09 +0200
committerKim Alvefur <zash@zash.se>2013-04-19 16:16:09 +0200
commit560edbb3909014d7ebdb20d6261ba1d9d593ff75 (patch)
tree3ef0a2ea8688663d800d608db52155b26d6124e1 /prosody
parentdffd8d701d680d9d9c30dcf3ed384cb703604eed (diff)
parent61e128107361da6460b27821b77308b0f73918d6 (diff)
downloadprosody-560edbb3909014d7ebdb20d6261ba1d9d593ff75.tar.gz
prosody-560edbb3909014d7ebdb20d6261ba1d9d593ff75.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions