diff options
author | matthew <matthew@silver> | 2008-08-24 18:08:04 +0100 |
---|---|---|
committer | matthew <matthew@silver> | 2008-08-24 18:08:04 +0100 |
commit | 25f82f43ad92f190e2373f0e61524bee826617b2 (patch) | |
tree | 1285f7cc14c92306dab94b104648dd1747812069 /main.lua | |
parent | 5ea14b62950a6a9cbdc96c7354afddcf637d9d41 (diff) | |
parent | dfe21804fe9558ac19d2327d2cf4ed16267bc3fc (diff) | |
download | prosody-25f82f43ad92f190e2373f0e61524bee826617b2.tar.gz prosody-25f82f43ad92f190e2373f0e61524bee826617b2.zip |
Merged 2 heads o_O
Diffstat (limited to 'main.lua')
0 files changed, 0 insertions, 0 deletions