Software / code / prosody
Comparison
core/objectmanager.lua @ 1229:331a68645f67
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 29 May 2009 22:06:21 +0100 |
| parent | 889:bb959588bbc4 |
| child | 1522:569d58d21612 |
comparison
equal
deleted
inserted
replaced
| 1228:853d3d76ba94 | 1229:331a68645f67 |
|---|