diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-04-03 22:26:14 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-04-03 22:26:14 +0100 |
commit | 1b43f0146e5de1245f6bcbd4b4e0fbd2f513b863 (patch) | |
tree | d32d806a8e7e2e8432dee7d2d93722ce5b4c2acb /plugins/mod_disco.lua | |
parent | 64991c424da09a66155e95d571318bc8f057a35e (diff) | |
parent | 8e1f8ca95861cdc5fc23f92e8719250a22d061ec (diff) | |
download | prosody-1b43f0146e5de1245f6bcbd4b4e0fbd2f513b863.tar.gz prosody-1b43f0146e5de1245f6bcbd4b4e0fbd2f513b863.zip |
Merge 0.6/MattJ -> 0.6
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions