Mercurial > prosody-hg
diff core/configmanager.lua @ 5162:cda4d3f01ddd
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 29 Sep 2012 10:47:37 +0100 |
| parents | a4a74a0e9b9c |
| children | ac530c44772e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 29 Sep 2012 10:47:37 +0100 |
| parents | a4a74a0e9b9c |
| children | ac530c44772e |