diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-04-20 18:20:29 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-04-20 18:20:29 +0100 |
commit | 4f90add96022e865d02b38ef8dfc6bcd9f7f486f (patch) | |
tree | 2ae520ecf1f70575b83532f368d96b9e10b2ee99 /plugins/mod_disco.lua | |
parent | 080a1ab98c4c2aae06dee41148d919f9e6a8b644 (diff) | |
parent | 49fb45a07bff1f2364743eaae6860c5b3370ebec (diff) | |
download | prosody-4f90add96022e865d02b38ef8dfc6bcd9f7f486f.tar.gz prosody-4f90add96022e865d02b38ef8dfc6bcd9f7f486f.zip |
Merge 0.8->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions