aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-10-15 17:07:17 +0100
committerMatthew Wild <mwild1@gmail.com>2010-10-15 17:07:17 +0100
commitad63e1f249fdd453fd93cee76a334329c1f8ccf4 (patch)
treec428bfb4615180955a6fa2f1b05266d760e3638a /prosody
parent0fffe6db92137179d88d848564c0f61d0daea1ef (diff)
parentc74e3999fb155de1015568aa9b79477f25d94e7d (diff)
downloadprosody-ad63e1f249fdd453fd93cee76a334329c1f8ccf4.tar.gz
prosody-ad63e1f249fdd453fd93cee76a334329c1f8ccf4.zip
Merge hoelzro->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions