diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-06-07 14:19:36 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-06-07 14:19:36 +0100 |
commit | e9c388582baab737b5aa092674bf8fb43a5a9e60 (patch) | |
tree | 5363ab1ef0780bc4038665de1b4b9149ae8fe4f4 /core/objectmanager.lua | |
parent | 2ef63904d65d0883e2687aa3d23bcbecf80f920e (diff) | |
parent | 2c8f13edc6e93b58c6e21fe8cb46bd3a84221a8b (diff) | |
download | prosody-e9c388582baab737b5aa092674bf8fb43a5a9e60.tar.gz prosody-e9c388582baab737b5aa092674bf8fb43a5a9e60.zip |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'core/objectmanager.lua')
0 files changed, 0 insertions, 0 deletions