Mercurial > prosody-hg
diff core/configmanager.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 |
| parents | a73715a9267f |
| children | 9d8c35e98ca2 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 29 May 2009 22:06:21 +0100 |
| parents | a73715a9267f |
| children | 9d8c35e98ca2 |