Mercurial > prosody-hg
diff core/servermanager.lua @ 138:cb0dd442ca63
Making the best attempt out of a bad merge from waqas
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 23 Oct 2008 18:24:55 +0100 |
| parents | 0abe771b43c6 |
| children | 4df26c981728 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 23 Oct 2008 18:24:55 +0100 |
| parents | 0abe771b43c6 |
| children | 4df26c981728 |