aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-26 12:25:53 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-26 12:25:53 +0100
commit68a25371ea0d8f8722fab24c840c85f9ec91da7d (patch)
tree60d2de07f0307ab6968d36f1f27f4b938e53dc80 /prosody
parent2716bbf64ff4f9c62bb578802de9e16b42d5203d (diff)
parentde337196d4b4952b9da5604d2437782c0372f8dd (diff)
downloadprosody-68a25371ea0d8f8722fab24c840c85f9ec91da7d.tar.gz
prosody-68a25371ea0d8f8722fab24c840c85f9ec91da7d.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions