diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-05-05 11:25:26 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-05-05 11:25:26 +0100 |
commit | cca05af3d369ba4e53cd76f7e33196c5ee8415b4 (patch) | |
tree | 3cf6088199b22392a519b5744cebe18cd40966e3 /plugins/mod_disco.lua | |
parent | 95eb788b3ee760d5677f48dbfcc8fd02b54d1a85 (diff) | |
parent | 93b148715f75aa29947fa3181cdf22d8209431a8 (diff) | |
download | prosody-cca05af3d369ba4e53cd76f7e33196c5ee8415b4.tar.gz prosody-cca05af3d369ba4e53cd76f7e33196c5ee8415b4.zip |
Merge 0.7->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions