Mercurial > prosody-hg
diff main.lua @ 153:8310bfddaba8
Merge from waqas
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 24 Oct 2008 07:57:06 +0100 |
| parents | d09b8a1ab046 |
| children | 5c2e6b9eeeb6 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 24 Oct 2008 07:57:06 +0100 |
| parents | d09b8a1ab046 |
| children | 5c2e6b9eeeb6 |