Mercurial > prosody-hg
diff core/configmanager.lua @ 5104:27b45d2c19fe
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 26 Aug 2012 19:58:59 +0100 |
| parents | 85b2689dbcfe |
| children | a4a74a0e9b9c |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 26 Aug 2012 19:58:59 +0100 |
| parents | 85b2689dbcfe |
| children | a4a74a0e9b9c |