diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-07-08 18:54:56 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-07-08 18:54:56 +0100 |
commit | 58e466f88e148ca443eb5bb4a5940feb300ce2fc (patch) | |
tree | 85fdcd9db00cd00b0ce2e2cc576fa7d7895caae9 /plugins/mod_disco.lua | |
parent | bd050e2b64086b818592f81606b52db8bb01309e (diff) | |
parent | 1c1baa42c8a2c047f938a442d776f33320013c0c (diff) | |
download | prosody-58e466f88e148ca443eb5bb4a5940feb300ce2fc.tar.gz prosody-58e466f88e148ca443eb5bb4a5940feb300ce2fc.zip |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions