Mercurial > prosody-hg
diff main.lua @ 6:7ad47ce20394
Merged 2 heads o_O
| author | matthew@silver |
|---|---|
| date | Sun, 24 Aug 2008 18:08:04 +0100 |
| parents | 57e4eb3aeac0 09c3845ed442 |
| children | dcc5ac721c20 |
| author | matthew@silver |
|---|---|
| date | Sun, 24 Aug 2008 18:08:04 +0100 |
| parents | 57e4eb3aeac0 09c3845ed442 |
| children | dcc5ac721c20 |