Mercurial > prosody-hg
diff core/configmanager.lua @ 3521:896ffec79f57
Merge hoelzro->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 15 Oct 2010 18:40:37 +0100 |
| parents | bb494c3aa364 |
| children | f31fa6520a4b |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 15 Oct 2010 18:40:37 +0100 |
| parents | bb494c3aa364 |
| children | f31fa6520a4b |