Mercurial > prosody-hg
diff core/configmanager.lua @ 6001:34f43c8167e5
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 21 Jan 2014 03:26:04 +0000 |
| parents | 5cf1c08805fb |
| children | ef4024f6bc40 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 21 Jan 2014 03:26:04 +0000 |
| parents | 5cf1c08805fb |
| children | ef4024f6bc40 |