diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-04-03 13:53:21 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-04-03 13:53:21 +0100 |
commit | a5ccb8a860924f48570242e468267885137e3e9a (patch) | |
tree | bf22e9f39d9ccaa98ba9f214cfa01d7c3408d46a /plugins/mod_disco.lua | |
parent | 1ea4d9ab7bde60b904192718247d49aa1337a18e (diff) | |
parent | 1728207c6bb7f3955535ba4a2c1c6fde8e624ed8 (diff) | |
download | prosody-a5ccb8a860924f48570242e468267885137e3e9a.tar.gz prosody-a5ccb8a860924f48570242e468267885137e3e9a.zip |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions