aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-06-02 19:27:45 +0200
committerKim Alvefur <zash@zash.se>2013-06-02 19:27:45 +0200
commit19f45e83ed793302d6ad65438acfbfb6da742d29 (patch)
tree8682d1e5655d123e3db62a1c4313216d976053bd /prosody
parent953b24c0ca0d5245a54828d4ce4619262f0e80a7 (diff)
parent323d7007f6b77c219602433f1f179ff642ae7afe (diff)
downloadprosody-19f45e83ed793302d6ad65438acfbfb6da742d29.tar.gz
prosody-19f45e83ed793302d6ad65438acfbfb6da742d29.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions