Mercurial > prosody-hg
diff plugins/mod_presence.lua @ 2933:e68ff49fa79b
Merge 0.6->0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 24 Mar 2010 22:34:59 +0000 |
| parents | 692b3c6c5bd2 |
| children | cb15fa9242f9 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 24 Mar 2010 22:34:59 +0000 |
| parents | 692b3c6c5bd2 |
| children | cb15fa9242f9 |