Mercurial > prosody-hg
diff core/hostmanager.lua @ 2914:9f6fec37d3e2
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 22 Mar 2010 14:38:01 +0000 |
| parents | 04958fb28c44 |
| children | 692b3c6c5bd2 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 22 Mar 2010 14:38:01 +0000 |
| parents | 04958fb28c44 |
| children | 692b3c6c5bd2 |