Mercurial > prosody-hg
diff core/eventmanager.lua @ 881:c508fb40552a
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 04 Mar 2009 18:48:29 +0000 |
| parents | 5216efe6088b |
| children | 0c706c3d2e30 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 04 Mar 2009 18:48:29 +0000 |
| parents | 5216efe6088b |
| children | 0c706c3d2e30 |