diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-12-03 16:13:12 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-12-03 16:13:12 +0000 |
commit | fd8f4e67d9cdf6c5de7ea86392573bfd7029160f (patch) | |
tree | ec81453553be8ea932864b20a1965d5b58e84ec0 /prosody | |
parent | de08c46b98679ccab99e06bb9150a40984f2cf4e (diff) | |
download | prosody-fd8f4e67d9cdf6c5de7ea86392573bfd7029160f.tar.gz prosody-fd8f4e67d9cdf6c5de7ea86392573bfd7029160f.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions