Mercurial > prosody-hg
diff core/configmanager.lua @ 5143:a86efd60425f
Merge 0.9->trunk
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Sun, 23 Sep 2012 01:13:08 +0500 |
| parents | a4a74a0e9b9c |
| children | ac530c44772e |
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Sun, 23 Sep 2012 01:13:08 +0500 |
| parents | a4a74a0e9b9c |
| children | ac530c44772e |