diff options
author | Kim Alvefur <zash@zash.se> | 2013-03-16 18:49:14 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-03-16 18:49:14 +0100 |
commit | 1e5040dab723c166096811422eaf3ae8e338b00e (patch) | |
tree | a097c4f3a59bd0cc87d76bf637dff458fb5ff330 /plugins/adhoc | |
parent | 61db12f927ed7e3532862616919623e8bac306f8 (diff) | |
parent | 04b647a6e847fa6ace495f3c8c7a2e9a5425fb1a (diff) | |
download | prosody-1e5040dab723c166096811422eaf3ae8e338b00e.tar.gz prosody-1e5040dab723c166096811422eaf3ae8e338b00e.zip |
Merge 0.9->trunk
Diffstat (limited to 'plugins/adhoc')
0 files changed, 0 insertions, 0 deletions