Mercurial > prosody-hg
diff core/configmanager.lua @ 5346:b8fbb9d07efc
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 12 Mar 2013 12:30:35 +0000 |
| parents | a4a74a0e9b9c |
| children | ac530c44772e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 12 Mar 2013 12:30:35 +0000 |
| parents | a4a74a0e9b9c |
| children | ac530c44772e |