aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-08-24 23:16:08 +0100
committerMatthew Wild <mwild1@gmail.com>2013-08-24 23:16:08 +0100
commit2a7c458b2f21f37a447c7e6dad76c65efc07d4f1 (patch)
tree46ee70e977ded44ebeb42ca6007865fd3f5996f3 /prosody
parent0c39eb02b91bc1028f523dde1d6b5112cbff8a7f (diff)
parent9c72583d71bdb11a6edc42cba583756385eafef3 (diff)
downloadprosody-2a7c458b2f21f37a447c7e6dad76c65efc07d4f1.tar.gz
prosody-2a7c458b2f21f37a447c7e6dad76c65efc07d4f1.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions