Mercurial > prosody-hg
diff core/configmanager.lua @ 5166:72cdc2d4e15e
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 01 Oct 2012 20:15:39 +0100 |
| parents | a4a74a0e9b9c |
| children | ac530c44772e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 01 Oct 2012 20:15:39 +0100 |
| parents | a4a74a0e9b9c |
| children | ac530c44772e |