diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-05-17 11:58:00 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-05-17 11:58:00 +0100 |
commit | dbd6ecb95eae510bd2ae009f9e44c528052f6b19 (patch) | |
tree | 3c7bd79f421d02889a064274601202a6b090d0a2 /plugins/mod_disco.lua | |
parent | 7a03cd0c613168053260e94f763a883519730357 (diff) | |
parent | 08ace7b7890a0c19a5cd5cf155df25e95d47e44a (diff) | |
download | prosody-dbd6ecb95eae510bd2ae009f9e44c528052f6b19.tar.gz prosody-dbd6ecb95eae510bd2ae009f9e44c528052f6b19.zip |
Merge 0.7->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions