diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-02-19 12:18:53 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-02-19 12:18:53 +0000 |
commit | 9e960c96e70ead67889c4d6fbc91b0260340887d (patch) | |
tree | 83d4920cd9d60bef48ee9a465978f102927addea /plugins | |
parent | 4c7d2c5ba6e64b5041aec931f48279cfeba1155d (diff) | |
parent | ef8fdb1846f38673a2a53ae7f146418d30104b51 (diff) | |
download | prosody-9e960c96e70ead67889c4d6fbc91b0260340887d.tar.gz prosody-9e960c96e70ead67889c4d6fbc91b0260340887d.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions