diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-03-24 22:34:59 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-03-24 22:34:59 +0000 |
commit | d16d14ade1716171913200e085f1af12e6c819eb (patch) | |
tree | 66bf8c232f9ec2c7738f908d1fb9c2de420d0e7d /plugins/mod_disco.lua | |
parent | 2536fa75c312dd7175629dcc38b5619897f8f00b (diff) | |
parent | 67a0c4e8db5af279127f5ee15a66b5ce0ea0d194 (diff) | |
download | prosody-d16d14ade1716171913200e085f1af12e6c819eb.tar.gz prosody-d16d14ade1716171913200e085f1af12e6c819eb.zip |
Merge 0.6->0.7
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions