diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-09-20 15:31:51 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-09-20 15:31:51 +0100 |
commit | f533a41dccd6714477d4ac8202488a6d47f2bb14 (patch) | |
tree | d4a1f04039d1b1ff3ebcf09a8ec3229da8eebb60 /core/discomanager.lua | |
parent | d989c5e4e9b10542907657febd8e1060251a1e48 (diff) | |
parent | 2724c957228a36047f9ba311110e493116f20952 (diff) | |
download | prosody-f533a41dccd6714477d4ac8202488a6d47f2bb14.tar.gz prosody-f533a41dccd6714477d4ac8202488a6d47f2bb14.zip |
Merge with 0.5
Diffstat (limited to 'core/discomanager.lua')
0 files changed, 0 insertions, 0 deletions