Mercurial > prosody-hg
diff core/configmanager.lua @ 5356:97197ca60cb2
Merge...
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 20 Mar 2013 20:35:59 +0000 |
| parents | a4a74a0e9b9c |
| children | ac530c44772e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 20 Mar 2013 20:35:59 +0000 |
| parents | a4a74a0e9b9c |
| children | ac530c44772e |