Mercurial > prosody-hg
diff core/configmanager.lua @ 4541:05f5ec99da77
Merge with trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 22 Jan 2012 22:55:49 +0000 |
| parents | 40905e7bf680 |
| children | 85b2689dbcfe |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 22 Jan 2012 22:55:49 +0000 |
| parents | 40905e7bf680 |
| children | 85b2689dbcfe |