Mercurial > prosody-hg
diff core/configmanager.lua @ 4956:bc26e6d519ae
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2012 15:36:31 +0100 |
| parents | 40905e7bf680 |
| children | 85b2689dbcfe |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2012 15:36:31 +0100 |
| parents | 40905e7bf680 |
| children | 85b2689dbcfe |