Mercurial > prosody-hg
diff core/configmanager.lua @ 6315:7a3e2f2d43fc
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:54:27 +0100 |
| parents | 5af7fe1014db |
| children | a3b9496673ee |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:54:27 +0100 |
| parents | 5af7fe1014db |
| children | a3b9496673ee |