Mercurial > prosody-hg
diff core/configmanager.lua @ 5866:10a16fdebe2c
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 10 Oct 2013 22:27:01 +0100 |
| parents | 5cf1c08805fb |
| children | ef4024f6bc40 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 10 Oct 2013 22:27:01 +0100 |
| parents | 5cf1c08805fb |
| children | ef4024f6bc40 |