aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-12-03 16:13:12 +0000
committerMatthew Wild <mwild1@gmail.com>2015-12-03 16:13:12 +0000
commitfd8f4e67d9cdf6c5de7ea86392573bfd7029160f (patch)
treeec81453553be8ea932864b20a1965d5b58e84ec0 /prosody
parentde08c46b98679ccab99e06bb9150a40984f2cf4e (diff)
downloadprosody-fd8f4e67d9cdf6c5de7ea86392573bfd7029160f.tar.gz
prosody-fd8f4e67d9cdf6c5de7ea86392573bfd7029160f.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions