aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-17 14:20:02 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-17 14:20:02 +0100
commitd138cfd437d5f9df479bf12adebefc9431953de9 (patch)
tree0c90ca4d14ad5a045fe03a72052e3d1f8aa28829 /prosody
parentca5bd83c74f92817ae9d97a1bf8ea33f5c63be86 (diff)
parent11233f48157c8e92a5fb77636a3cd09c557d4d48 (diff)
downloadprosody-d138cfd437d5f9df479bf12adebefc9431953de9.tar.gz
prosody-d138cfd437d5f9df479bf12adebefc9431953de9.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions