Mercurial > prosody-hg
diff core/configmanager.lua @ 3376:529bc6ea24e2
Merge Zash->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 16 Jul 2010 15:10:45 +0100 |
| parents | 6d86e26f0923 |
| children | b7600dd7cd42 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 16 Jul 2010 15:10:45 +0100 |
| parents | 6d86e26f0923 |
| children | b7600dd7cd42 |